Crubin/remove request promise

.travis.yml

@@ -1,11 +1,15 @@
 language: node_js
 node_js:
   - "5"
-  - "0.10"
+  - "6"
   - "node"
 branches:
   only:
     - master
+before_script:
+  - npm install grunt-cli -g
 install: "npm install"
 script:
-  - "npm test"
+  - "npm run test-travis"
+after_success:
+- npm run coveralls

CHANGELOG

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------------------
+1.4.1
+-------------------------------------------------------------------------------
+* Switched to karma/browserstack for cross-browser testing
+* Removed es6-promise
+* Bump optimizely-server-sdk to version 1.3.1, which includes:
+  - Minor performance improvements.
+-------------------------------------------------------------------------------
+
 -------------------------------------------------------------------------------
 1.4.0
 -------------------------------------------------------------------------------

Gruntfile.js

@@ -0,0 +1,16 @@
+module.exports = function (grunt) {
+    grunt.initConfig({
+        karma: {
+            unit: {
+                configFile: 'karma.bs.conf.js',
+                singleRun: true,
+                reporters: 'progress',
+                runnerPort: 9998
+            }
+        }
+    });
+
+    require('load-grunt-tasks')(grunt);
+
+    grunt.registerTask('default', ['karma']);
+};

Scripts/ci_unit_tests.sh

@@ -5,7 +5,7 @@
 export NVM_DIR="`pwd`/.nvm" # truly local nvm install not needing sudo
 mkdir -p $NVM_DIR
 curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.0/install.sh | bash
-[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" 
+[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
 
 function run_tests () {
   echo "Installing node" $1

index.js

@@ -22,7 +22,7 @@ var logger = require('optimizely-server-sdk/lib/plugins/logger');
 
 var Optimizely = require('optimizely-server-sdk/lib/optimizely');
 
-var JAVASCRIPT_CLIENT_VERSION = '1.4.0';
+var JAVASCRIPT_CLIENT_VERSION = '1.4.1';
 var MODULE_NAME = 'INDEX';
 
 /**

karma.bs.conf.js

@@ -0,0 +1,137 @@
+// Karma configuration
+// Generated on Wed May 24 2017 14:10:20 GMT-0700 (PDT)
+
+module.exports = function(config) {
+  config.set({
+
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: '',
+
+    //plugins
+    plugins: ['karma-mocha', 'karma-webpack', 'karma-browserstack-launcher'],
+
+    //browserStack setup
+    browserStack: {
+      username: 'echo $BROWSER_STACK_USERNAME',
+      accessKey: 'echo $BROWSER_STACK_ACCESS_KEY'
+    },
+
+    // to avoid DISCONNECTED messages when connecting to BrowserStack
+    browserDisconnectTimeout : 10000, // default 2000
+    browserDisconnectTolerance : 1, // default 0
+    browserNoActivityTimeout : 4*60*1000, //default 10000
+    captureTimeout : 4*60*1000, //default 60000
+
+    // define browsers
+    customLaunchers: {
+      bs_chrome_mac: {
+        base: 'BrowserStack',
+        browser: 'chrome',
+        browser_version: '21.0',
+        os: 'OS X',
+        os_version: 'Mountain Lion'
+      },
+      bs_edge: {
+        base: 'BrowserStack',
+        os: 'Windows',
+        os_version: '10',
+        browser: 'edge',
+        device: null,
+        browser_version: "15.0"
+      },
+      bs_firefox_mac: {
+        base: 'BrowserStack',
+        browser: 'firefox',
+        browser_version: '21.0',
+        os: 'OS X',
+        os_version: 'Mountain Lion'
+      },
+      bs_ie: {
+        base: 'BrowserStack',
+        os: "Windows",
+        os_version: "7",
+        browser: "ie",
+        device: null,
+        browser_version: "10.0"
+      },
+      bs_iphone6: {
+        base: 'BrowserStack',
+        device: 'iPhone 6',
+        os: 'ios',
+        os_version: '8.3'
+      },
+      bs_opera_mac: {
+        base: 'BrowserStack',
+        browser: 'opera',
+        browser_version: '37',
+        os: 'OS X',
+        os_version: 'Mountain Lion'
+      },
+      bs_safari: {
+        base: 'BrowserStack',
+        os: "OS X",
+        os_version: "Mountain Lion",
+        browser: "safari",
+        device: null,
+        browser_version: "6.2"
+      }
+    },
+
+    browsers: ['bs_chrome_mac', 'bs_edge', 'bs_firefox_mac', 'bs_ie', 'bs_iphone6', 'bs_opera_mac', 'bs_safari'],
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['mocha'],
+
+
+    // list of files / patterns to load in the browser
+    files: [
+      {pattern: './tests.js', watched: false},
+      {pattern: './lib/**/*tests.js', watched: false}
+    ],
+
+
+    // list of files to exclude
+    exclude: [
+    ],
+
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    preprocessors: {
+      './tests.js': ['webpack'],
+      './lib/**/*tests.js': ['webpack']
+    },
+
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['progress'],
+
+
+    // web server port
+    port: 9876,
+
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: false,
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: true,
+
+    // Concurrency level
+    // how many browser should be started simultaneous
+    concurrency: Infinity
+  })
+}

karma.conf.js

@@ -0,0 +1,83 @@
+// Karma configuration
+// Generated on Thu Jun 01 2017 10:12:37 GMT-0700 (PDT)
+
+module.exports = function(config) {
+  config.set({
+
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: '',
+
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['mocha', 'chai'],
+
+
+    // list of files / patterns to load in the browser
+    files: [
+      './tests.js',
+      './lib/**/*tests.js'
+    ],
+
+
+    // list of files to exclude
+    exclude: [
+    ],
+
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    preprocessors: {
+    },
+
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['progress'],
+
+
+    // web server port
+    port: 9876,
+
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: false,
+
+
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: ['Chrome'],
+
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: true,
+
+    // Concurrency level
+    // how many browser should be started simultaneous
+    concurrency: Infinity,
+
+    preprocessors: {
+            // add webpack as preprocessor
+            './tests.js': ['webpack'],
+            './lib/**/*tests.js': ['webpack']
+        },
+
+    plugins: [
+            require("karma-webpack"),
+            'karma-mocha',
+            'karma-chai',
+            'karma-chrome-launcher'
+        ]
+  })
+}

lib/plugins/event_dispatcher/index.js

@@ -14,50 +14,46 @@
  * limitations under the License.
  */
 var fns = require('optimizely-server-sdk/lib/utils/fns');
-var es6Promise = require('es6-promise').Promise;
 
 var POST_METHOD = 'POST';
 var GET_METHOD = 'GET';
+var READYSTATE_COMPLETE = 4;
 
 module.exports = {
   /**
    * Sample event dispatcher implementation for tracking impression and conversions
    * Users of the SDK can provide their own implementation
    * @param  {Object} eventObj
-   * @return {Promise<Object>}
+   * @param  {Function} callback
    */
-  dispatchEvent: function(eventObj) {
+  dispatchEvent: function(eventObj, callback) {
     var url = eventObj.url;
     var params = eventObj.params;
-
     if (eventObj.httpVerb === POST_METHOD) {
-      return new es6Promise(function(resolve, reject) {
-
-        var req = new XMLHttpRequest();
-        req.open(POST_METHOD, url, true);
-        req.setRequestHeader('Content-Type', 'application/json');
-        req.addEventListener('load', function (evt) {
-          var responseObj = evt.target.responseText;
-          resolve(responseObj);
-        });
-        req.send(JSON.stringify(params));
-      });
-    } else {
-      return new es6Promise(function (resolve, reject) {
-        // add param for cors headers to be sent by the log endpoint
-        url += '?wxhr=true';
-        if (params) {
-          url += '&' + toQueryString(params);
+      var req = new XMLHttpRequest();
+      req.open(POST_METHOD, url, true);
+      req.setRequestHeader('Content-Type', 'application/json');
+      req.onreadystatechange = function() {
+        if (req.readyState === READYSTATE_COMPLETE && callback && typeof callback === 'function') {
+          callback(params);
         }
+      };
+      req.send(JSON.stringify(params));
+    } else {
+      // add param for cors headers to be sent by the log endpoint
+      url += '?wxhr=true';
+      if (params) {
+        url += '&' + toQueryString(params);
+      }
 
-        var req = new XMLHttpRequest();
-        req.open(GET_METHOD, url, true);
-        req.addEventListener('load', function (evt) {
-          var responseObj = JSON.parse(evt.target.responseText);
-          resolve(responseObj);
-        });
-        req.send();
-      });
+      var req = new XMLHttpRequest();
+      req.open(GET_METHOD, url, true);
+      req.onreadystatechange = function() {
+        if (req.readyState === READYSTATE_COMPLETE && callback && typeof callback === 'function') {
+          callback();
+        }
+      };
+      req.send();
     }
   },
 };