converted audience_evaluator in core

Author: fayyazarshad

packages/optimizely-sdk/lib/core/audience_evaluator/index.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2016, 2018-2019 Optimizely
+ * Copyright 2016, 2018-2020 Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var conditionTreeEvaluator = require('../condition_tree_evaluator');
-var customAttributeConditionEvaluator = require('../custom_attribute_condition_evaluator');
-var enums = require('../../utils/enums');
-var fns = require('../../utils/fns');
-var sprintf = require('@optimizely/js-sdk-utils').sprintf;
-var logging = require('@optimizely/js-sdk-logging');
-var logger = logging.getLogger();
+import conditionTreeEvaluator from '../condition_tree_evaluator';
+import customAttributeConditionEvaluator from '../custom_attribute_condition_evaluator';
+import enums from '../../utils/enums';
+import fns from '../../utils/fns';
+import { sprintf } from '@optimizely/js-sdk-utils';
+import { getLogger } from '@optimizely/js-sdk-logging';
+var logger = getLogger();
 
 var ERROR_MESSAGES = enums.ERROR_MESSAGES;
 var LOG_LEVEL = enums.LOG_LEVEL;
@@ -108,4 +108,4 @@ AudienceEvaluator.prototype.evaluateConditionWithUserAttributes = function(userA
   return null;
 };
 
-module.exports = AudienceEvaluator;
+export default AudienceEvaluator;

packages/optimizely-sdk/lib/core/audience_evaluator/index.tests.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2016, 2018-2019 Optimizely
+ * Copyright 2016, 2018-2020 Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var AudienceEvaluator = require('./');
-var chai = require('chai');
-var conditionTreeEvaluator = require('../condition_tree_evaluator');
-var customAttributeConditionEvaluator = require('../custom_attribute_condition_evaluator');
-var sinon = require('sinon');
+import AudienceEvaluator from './index';
+import chai from 'chai';
+import conditionTreeEvaluator from '../condition_tree_evaluator';
+import customAttributeConditionEvaluator from '../custom_attribute_condition_evaluator';
+import sinon from 'sinon';
+import { getLogger } from '@optimizely/js-sdk-logging';
+
 var assert = chai.assert;
-var logging = require('@optimizely/js-sdk-logging');
-var mockLogger = logging.getLogger();
-var enums = require('../../utils/enums');
-var LOG_LEVEL = enums.LOG_LEVEL;
+var mockLogger = getLogger();
 
 var chromeUserAudience = {
   conditions: [

packages/optimizely-sdk/lib/core/decision_service/index.js

@@ -14,7 +14,7 @@
  * limitations under the License.                                           *
  ***************************************************************************/
 
-var AudienceEvaluator = require('../audience_evaluator');
+var AudienceEvaluator = require('../audience_evaluator').default;
 var bucketer = require('../bucketer');
 var enums = require('../../utils/enums');
 var fns = require('../../utils/fns');

packages/optimizely-sdk/lib/core/decision_service/index.tests.js

@@ -28,7 +28,7 @@ var sprintf = require('@optimizely/js-sdk-utils').sprintf;
 var testData = require('../../tests/test_data').getTestProjectConfig();
 var testDataWithFeatures = require('../../tests/test_data').getTestProjectConfigWithFeatures();
 var jsonSchemaValidator = require('../../utils/json_schema_validator');
-var AudienceEvaluator = require('../audience_evaluator');
+var AudienceEvaluator = require('../audience_evaluator').default;
 
 var chai = require('chai');
 var sinon = require('sinon');

packages/optimizely-sdk/lib/index.browser.tests.js

@@ -55,6 +55,7 @@ describe('javascript-sdk', function() {
         sinon.stub(configValidator, 'validate');
 
         xhr = sinon.useFakeXMLHttpRequest();
+        global.XMLHttpRequest = xhr;
         requests = [];
         xhr.onCreate = function(req) {
           requests.push(req);

packages/optimizely-sdk/lib/index.browser.umdtests.js

@@ -42,6 +42,7 @@ describe('javascript-sdk', function() {
         sinon.stub(Optimizely.prototype, 'close');
 
         xhr = sinon.useFakeXMLHttpRequest();
+        global.XMLHttpRequest = xhr;
         requests = [];
         xhr.onCreate = function(req) {
           requests.push(req);

packages/optimizely-sdk/lib/optimizely/index.tests.js

@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 var Optimizely = require('./');
-var AudienceEvaluator = require('../core/audience_evaluator');
+var AudienceEvaluator = require('../core/audience_evaluator').default;
 var bluebird = require('bluebird');
 var bucketer = require('../core/bucketer');
 var projectConfigManager = require('../core/project_config/project_config_manager');
@@ -29,7 +29,6 @@ var jsonSchemaValidator = require('../utils/json_schema_validator');
 var logger = require('../plugins/logger');
 var decisionService = require('../core/decision_service');
 var testData = require('../tests/test_data');
-var jsonSchemaValidator = require('../utils/json_schema_validator');
 var projectConfig = require('../core/project_config');
 var logging = require('@optimizely/js-sdk-logging');