Merge pull request #75 from launchdarkly/1.6.1

Prepare 1.6.1

Author: apucacao

.circleci/config.yml

@@ -0,0 +1,18 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/node:6-browsers
+    steps:
+      - checkout
+      - run: npm install
+      - run: mkdir -p reports/junit
+      - run:
+          command: npm test
+          environment:
+            JUNIT_REPORT_PATH: "./reports/junit/"
+            JUNIT_REPORT_NAME: "js-test-results.xml"
+      - store_test_results:
+          path: reports/junit/
+      - store_artifacts:
+          path: reports/junit/

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+**/junit.xml
 npm-debug.log
 node_modules
 dist

CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to the LaunchDarkly client-side JavaScript SDK will be documented in this file. This 
 project adheres to [Semantic Versioning](http://semver.org).
 
+## [1.6.1] - 2018-03-30
+### Fixed
+- The SDK now polls the URL for changes if (and only if) there are page view goals,to ensure it is accurately reporting page views.
+
 ## [1.6.0] - 2018-03-28
 ### Changed
 - Added support for a future update to LaunchDarkly that will deliver individual feature flag changes over the streaming connection as they occur, rather than requiring the client to re-request all flags for each change.

karma.conf.js

@@ -10,8 +10,14 @@ module.exports = function(config) {
       'tests.webpack.js': [ 'webpack', 'sourcemap' ]
     },
 
-    reporters: ['mocha'],
+    reporters: ['mocha', 'junit'],
 
+    junitReporter: {
+      outputDir: process.env.JUNIT_REPORT_PATH || '.',
+      outputFile: process.env.JUNIT_REPORT_NAME || 'junit.xml',
+      useBrowserName: false
+    },
+
     frameworks: ['mocha', 'chai', 'sinon'],
 
     browsers: ['Chrome'],

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ldclient-js",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "LaunchDarkly SDK for JavaScript",
   "author": "LaunchDarkly <[email protected]>",
   "license": "Apache-2.0",
@@ -31,6 +31,7 @@
     "karma": "0.13.22",
     "karma-chai": "0.1.0",
     "karma-chrome-launcher": "1.0.1",
+    "karma-junit-reporter": "1.2.0",
     "karma-mocha": "1.0.1",
     "karma-mocha-reporter": "2.0.4",
     "karma-phantomjs-launcher": "0.2.1",

package.json

@@ -29,11 +29,13 @@ function initialize(env, user, options) {
   var localStorageKey;
   var goals;
   var subscribedToChangeEvents;
+  var locationWatcher;
 
   var readyEvent = 'ready';
   var changeEvent = 'change';
 
   var flushInterval = 2000;
+  var locationWatcherInterval = 300;
 
   var seenRequests = {};
 
@@ -422,13 +424,32 @@ function initialize(env, user, options) {
     }
   }
 
-  function attachHistoryListeners() {
+  function watchLocation(interval, callback) {
+    var previousUrl = location.href;
+    var currentUrl;
+
+    function checkUrl() {
+      currentUrl = location.href;
+
+      if (currentUrl !== previousUrl) {
+        previousUrl = currentUrl;
+        callback();
+      }
+    }
+
+    function poll(fn, interval) {
+      fn();
+      setTimeout(function() {
+        poll(fn, interval);
+      }, interval);
+    }
+
+    poll(checkUrl, interval);
+
     if (!!(window.history && history.pushState)) {
-      window.removeEventListener('popstate',refreshGoalTracker);
-      window.addEventListener('popstate', refreshGoalTracker);
+      window.addEventListener('popstate', checkUrl);
     } else {
-      window.removeEventListener('hashchange', refreshGoalTracker);
-      window.addEventListener('hashchange', refreshGoalTracker);
+      window.addEventListener('hashchange', checkUrl);
     }
   }
 
@@ -439,7 +460,7 @@ function initialize(env, user, options) {
     if (g && g.length > 0) {
       goals = g;
       goalTracker = GoalTracker(goals, sendGoalEvent);
-      attachHistoryListeners();
+      watchLocation(locationWatcherInterval, refreshGoalTracker);
     }
   });