Merge pull request #67 from amplitude/fix_cookie_test

fix cookie test key

Author: djih

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 * Add tracking of each user's initial_utm parameters (which is captured as a set once operation). Utm parameters are now sent only once per user session.
 * Add documentation for SDK functions. You can take a look [here](https://rawgit.com/amplitude/Amplitude-Javascript/defensive_cleanup/documentation/Amplitude.html). A link has also been added to the Readme.
+* Fix cookie test bug. In rare cases, the cookie test failed to delete the key used in testing. Reloading the page generated new keys, filling up the cookie over time. Fixed test to re-use the same key.
 
 ### 2.10.0 (March 30, 2016)
 

amplitude.js

@@ -1136,7 +1136,9 @@ module.exports = {
   // Used in cookie as well
   DEVICE_ID: 'amplitude_deviceId',
   OPT_OUT: 'amplitude_optOut',
-  USER_ID: 'amplitude_userId'
+  USER_ID: 'amplitude_userId',
+
+  COOKIE_TEST: 'amplitude_cookie_test'
 };
 
 }, {}],
@@ -1148,6 +1150,7 @@ module.exports = {
  * Uses cookie if available, otherwise fallback to localstorage.
  */
 
+var Constants = require('./constants');
 var Cookie = require('./cookie');
 var JSON = require('json'); // jshint ignore:line
 var localStorage = require('./localstorage'); // jshint ignore:line
@@ -1161,9 +1164,9 @@ cookieStorage.prototype._cookiesEnabled = function() {
   var uid = String(new Date());
   var result;
   try {
-    Cookie.set(uid, uid);
-    result = Cookie.get(uid) === uid;
-    Cookie.remove(uid);
+    Cookie.set(Constants.COOKIE_TEST, uid);
+    result = Cookie.get(Constants.COOKIE_TEST) === uid;
+    Cookie.remove(Constants.COOKIE_TEST);
     return result;
   } catch (e) {
     // cookies are not enabled
@@ -1233,7 +1236,7 @@ cookieStorage.prototype.getStorage = function() {
 
 module.exports = cookieStorage;
 
-}, {"./cookie":18,"json":7,"./localstorage":8}],
+}, {"./constants":3,"./cookie":18,"json":7,"./localstorage":8}],
 18: [function(require, module, exports) {
 /*
  * Cookie data

amplitude.min.js

@@ -15,5 +15,7 @@ module.exports = {
   // Used in cookie as well
   DEVICE_ID: 'amplitude_deviceId',
   OPT_OUT: 'amplitude_optOut',
-  USER_ID: 'amplitude_userId'
+  USER_ID: 'amplitude_userId',
+
+  COOKIE_TEST: 'amplitude_cookie_test'
 };

src/constants.js

@@ -5,6 +5,7 @@
  * Uses cookie if available, otherwise fallback to localstorage.
  */
 
+var Constants = require('./constants');
 var Cookie = require('./cookie');
 var JSON = require('json'); // jshint ignore:line
 var localStorage = require('./localstorage'); // jshint ignore:line
@@ -18,9 +19,9 @@ cookieStorage.prototype._cookiesEnabled = function() {
   var uid = String(new Date());
   var result;
   try {
-    Cookie.set(uid, uid);
-    result = Cookie.get(uid) === uid;
-    Cookie.remove(uid);
+    Cookie.set(Constants.COOKIE_TEST, uid);
+    result = Cookie.get(Constants.COOKIE_TEST) === uid;
+    Cookie.remove(Constants.COOKIE_TEST);
     return result;
   } catch (e) {
     // cookies are not enabled