From 973e6fc51d5252cada9792421c08e0a11c46d84a Mon Sep 17 00:00:00 2001 From: Dana Date: Mon, 16 Nov 2015 15:25:26 +0000 Subject: [PATCH 1/3] Changes signature of addTrait and adds filtering for test users --- node_modules/c9/has-internal-test-name.js | 20 ++++++++ .../c9/has-internal-test-name_test.js | 47 +++++++++++++++++++ node_modules/c9/skip-analytics.js | 4 +- 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 node_modules/c9/has-internal-test-name.js create mode 100644 node_modules/c9/has-internal-test-name_test.js diff --git a/node_modules/c9/has-internal-test-name.js b/node_modules/c9/has-internal-test-name.js new file mode 100644 index 00000000..72c7413b --- /dev/null +++ b/node_modules/c9/has-internal-test-name.js @@ -0,0 +1,20 @@ +if (define === undefined) { + var define = function(fn) { + fn(require, exports, module); + }; +} + +define(function(require, exports, module) { + "use strict"; + + var internalTestNames = ["c9test", "c9 test"]; + var regex = new RegExp(".*(" + internalTestNames.join("|") + ").*", "g"); + + function hasInternalTestName(name) { + if (!name) return false; + + return regex.test(name); + } + + module.exports = hasInternalTestName; +}); \ No newline at end of file diff --git a/node_modules/c9/has-internal-test-name_test.js b/node_modules/c9/has-internal-test-name_test.js new file mode 100644 index 00000000..3909cf93 --- /dev/null +++ b/node_modules/c9/has-internal-test-name_test.js @@ -0,0 +1,47 @@ +"use strict"; +"use mocha"; + +require("c9/inline-mocha")(module); +var assert = require("assert"); +var faker = require("faker"); +var hasInternalTestName= require("c9/has-internal-test-name"); + +describe("has-internal-test-name", function() { + + it("returns false when undefined name", function() { + var name; + + assert.equal(false, hasInternalTestName(name), "should return false when name undefined"); + }); + + it("returns true when name contains c9test", function() { + var name = "c9testjkdfkfd"; + assert.equal(true, hasInternalTestName(name), "should return true when name contains c9test"); + + name = "c9test jjkdfhfkjfdh"; + assert.equal(true, hasInternalTestName(name), "should return true when name contains c9test"); + + name = " c9testjhrrj"; + assert.equal(true, hasInternalTestName(name), "should return true when name contains c9test"); + + name = " c9testjhrrj ffjh"; + assert.equal(true, hasInternalTestName(name), "should return true when name contains c9test"); + }); + + it("returns true when name contains c9 test", function() { + var name = "c9 test dkjfdgjhfgdfk"; + assert.equal(true, hasInternalTestName(name), "should return true when name contains c9 test"); + + name = "c9 testdkjfdgjhfgdfk"; + assert.equal(true, hasInternalTestName(name), "should return true when name contains c9 test"); + + name = " c9 test dkjfdgjhfgdfk "; + assert.equal(true, hasInternalTestName(name), "should return true when name contains c9 test"); + }); + + it("returns false when not internal user test name", function() { + var name = faker.name.firstName(); + + assert.equal(false, hasInternalTestName(name), "should return false when name is not for internal testing"); + }); +}); \ No newline at end of file diff --git a/node_modules/c9/skip-analytics.js b/node_modules/c9/skip-analytics.js index 7362fd63..7133131c 100644 --- a/node_modules/c9/skip-analytics.js +++ b/node_modules/c9/skip-analytics.js @@ -6,12 +6,14 @@ if (define === undefined) { define(function(require, exports, module) { "use strict"; - + var hasInternalDomain = require("c9/has-internal-domain"); + var hasInternalTestName = require("c9/has-internal-test-name"); function skipAnalytics(user) { if (!user) return true; if (user.id === -1) return true; + if (hasInternalTestName(user.name)) return true; if (hasInternalDomain(user.email)) return true; return false; } From 94c568a5328244c53d5c37b003b9e84dac46a46d Mon Sep 17 00:00:00 2001 From: Dana Date: Mon, 23 Nov 2015 09:43:34 +0000 Subject: [PATCH 2/3] Fixes regex and tests --- node_modules/c9/has-internal-test-name.js | 2 +- .../c9/has-internal-test-name_test.js | 15 ++++++--------- node_modules/c9/skip-analytics.js | 1 + node_modules/c9/skip-analytics_test.js | 19 +++++++++++++++++++ 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/node_modules/c9/has-internal-test-name.js b/node_modules/c9/has-internal-test-name.js index 72c7413b..9b99f096 100644 --- a/node_modules/c9/has-internal-test-name.js +++ b/node_modules/c9/has-internal-test-name.js @@ -8,7 +8,7 @@ define(function(require, exports, module) { "use strict"; var internalTestNames = ["c9test", "c9 test"]; - var regex = new RegExp(".*(" + internalTestNames.join("|") + ").*", "g"); + var regex = new RegExp("^(" + internalTestNames.join("|") + ")+"); function hasInternalTestName(name) { if (!name) return false; diff --git a/node_modules/c9/has-internal-test-name_test.js b/node_modules/c9/has-internal-test-name_test.js index 3909cf93..9e5dff4c 100644 --- a/node_modules/c9/has-internal-test-name_test.js +++ b/node_modules/c9/has-internal-test-name_test.js @@ -15,27 +15,24 @@ describe("has-internal-test-name", function() { }); it("returns true when name contains c9test", function() { - var name = "c9testjkdfkfd"; + var name = "c9testregnjkdfkfd"; assert.equal(true, hasInternalTestName(name), "should return true when name contains c9test"); - name = "c9test jjkdfhfkjfdh"; + name = "c9test01"; assert.equal(true, hasInternalTestName(name), "should return true when name contains c9test"); - name = " c9testjhrrj"; - assert.equal(true, hasInternalTestName(name), "should return true when name contains c9test"); - - name = " c9testjhrrj ffjh"; + name = "c9testjhrrj ffjh"; assert.equal(true, hasInternalTestName(name), "should return true when name contains c9test"); }); - + it("returns true when name contains c9 test", function() { var name = "c9 test dkjfdgjhfgdfk"; assert.equal(true, hasInternalTestName(name), "should return true when name contains c9 test"); - name = "c9 testdkjfdgjhfgdfk"; + name = "c9 test07"; assert.equal(true, hasInternalTestName(name), "should return true when name contains c9 test"); - name = " c9 test dkjfdgjhfgdfk "; + name = "c9 testdkjfdgjhfgdfk"; assert.equal(true, hasInternalTestName(name), "should return true when name contains c9 test"); }); diff --git a/node_modules/c9/skip-analytics.js b/node_modules/c9/skip-analytics.js index 7133131c..108f8a76 100644 --- a/node_modules/c9/skip-analytics.js +++ b/node_modules/c9/skip-analytics.js @@ -13,6 +13,7 @@ define(function(require, exports, module) { function skipAnalytics(user) { if (!user) return true; if (user.id === -1) return true; + if (hasInternalTestName(user.name)) return true; if (hasInternalDomain(user.email)) return true; return false; diff --git a/node_modules/c9/skip-analytics_test.js b/node_modules/c9/skip-analytics_test.js index 300251b0..bfaf1215 100644 --- a/node_modules/c9/skip-analytics_test.js +++ b/node_modules/c9/skip-analytics_test.js @@ -22,6 +22,25 @@ describe("skip-analytics", function() { assert.equal(true, skipAnalytics(user), "skipAnalytics should return true when user id is -1"); }); + + it("returns false when user does not have an internal test name and no email", function() { + var user = { + id: faker.random.uuid(), + name: faker.name.firstName() + }; + + assert.equal(false, skipAnalytics(user), "skipAnalytics should return false when user does not have an internal test name and no email"); + }); + + it("returns true when user has an internal test name and no email", function() { + var user = { + id: faker.random.uuid(), + name: "c9test07" + }; + + assert.equal(true, skipAnalytics(user), "skipAnalytics should return true when user has an internal test name and no email"); + }); + it("returns false when user has no email", function() { var user = { id: faker.random.uuid() From 134eeaf0fcfa039055e2b45ed31ab552aeeab51f Mon Sep 17 00:00:00 2001 From: Dana Date: Mon, 23 Nov 2015 14:19:53 +0000 Subject: [PATCH 3/3] Adds further filtering --- node_modules/c9/has-internal-test-name.js | 8 +++++--- node_modules/c9/skip-analytics.js | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/node_modules/c9/has-internal-test-name.js b/node_modules/c9/has-internal-test-name.js index 9b99f096..82f65452 100644 --- a/node_modules/c9/has-internal-test-name.js +++ b/node_modules/c9/has-internal-test-name.js @@ -10,10 +10,12 @@ define(function(require, exports, module) { var internalTestNames = ["c9test", "c9 test"]; var regex = new RegExp("^(" + internalTestNames.join("|") + ")+"); - function hasInternalTestName(name) { - if (!name) return false; + function hasInternalTestName(user) { + if (!user.name && !user.username) return false; + + var testedName = user.name ? user.name : user.username; - return regex.test(name); + return regex.test(testedName); } module.exports = hasInternalTestName; diff --git a/node_modules/c9/skip-analytics.js b/node_modules/c9/skip-analytics.js index 108f8a76..9d6f4850 100644 --- a/node_modules/c9/skip-analytics.js +++ b/node_modules/c9/skip-analytics.js @@ -14,7 +14,7 @@ define(function(require, exports, module) { if (!user) return true; if (user.id === -1) return true; - if (hasInternalTestName(user.name)) return true; + if (hasInternalTestName(user)) return true; if (hasInternalDomain(user.email)) return true; return false; }