From 262ca37d7f2ed75c94d6171bc2fb7c972010da14 Mon Sep 17 00:00:00 2001 From: Serge Zarembsky Date: Thu, 8 Mar 2018 14:30:17 -0500 Subject: [PATCH 1/3] Fix for GH-859 --- src/background.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/background.js b/src/background.js index 8253ff887..923a603f5 100644 --- a/src/background.js +++ b/src/background.js @@ -1226,6 +1226,8 @@ function initializeGhosteryModules() { conf.version_history = version_history; metrics.ping('upgrade'); + //We don't want install_complete pings for upgrade + conf.metrics.install_complete_all = Number(new Date().getTime()); } else if (globals.JUST_INSTALLED) { log('JUST INSTALLED'); const date = new Date(); From 504680e77d332de44d56eaefbacc62025a6d8530 Mon Sep 17 00:00:00 2001 From: Serge Zarembsky Date: Thu, 8 Mar 2018 14:48:45 -0500 Subject: [PATCH 2/3] Linting. --- src/background.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/background.js b/src/background.js index 923a603f5..2c970c636 100644 --- a/src/background.js +++ b/src/background.js @@ -1226,7 +1226,7 @@ function initializeGhosteryModules() { conf.version_history = version_history; metrics.ping('upgrade'); - //We don't want install_complete pings for upgrade + // We don't want install_complete pings for upgrade conf.metrics.install_complete_all = Number(new Date().getTime()); } else if (globals.JUST_INSTALLED) { log('JUST INSTALLED'); From b16336d838cdc6cd83da94e7a5fa479a3c521132 Mon Sep 17 00:00:00 2001 From: Serge Zarembsky Date: Thu, 8 Mar 2018 15:09:37 -0500 Subject: [PATCH 3/3] Change to be able to run unit tests on Windows. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 66680cca0..9bcf04c0e 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "prebuild.dev": "node ./tools/licenses/fetchLicenses.js", "prebuild.prod": "node ./tools/licenses/fetchLicenses.js", "prebuild.watch": "node ./tools/licenses/fetchLicenses.js", - "test.unit": "BABEL_ENV=test jest", + "test.unit": "cross-env BABEL_ENV=test jest", "lint": "eslint --ext .js,.jsx ./app ./src", "lint.fix": "eslint --ext .js,.jsx ./app ./src --fix", "lint.raw": "eslint --ext .js,.jsx",