From c1fdf4906a5f4f7ff7151d10693450f7eaa4c5ae Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Mon, 23 Nov 2015 19:34:46 +0100 Subject: [PATCH] Revert "Refactor addtrait" --- node_modules/c9/has-internal-test-name.js | 22 ---------- .../c9/has-internal-test-name_test.js | 44 ------------------- node_modules/c9/skip-analytics.js | 5 +-- node_modules/c9/skip-analytics_test.js | 19 -------- 4 files changed, 1 insertion(+), 89 deletions(-) delete mode 100644 node_modules/c9/has-internal-test-name.js delete 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 deleted file mode 100644 index 82f65452..00000000 --- a/node_modules/c9/has-internal-test-name.js +++ /dev/null @@ -1,22 +0,0 @@ -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("|") + ")+"); - - function hasInternalTestName(user) { - if (!user.name && !user.username) return false; - - var testedName = user.name ? user.name : user.username; - - return regex.test(testedName); - } - - 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 deleted file mode 100644 index 9e5dff4c..00000000 --- a/node_modules/c9/has-internal-test-name_test.js +++ /dev/null @@ -1,44 +0,0 @@ -"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 = "c9testregnjkdfkfd"; - assert.equal(true, hasInternalTestName(name), "should return true when name contains c9test"); - - name = "c9test01"; - 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 test07"; - 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"); - }); - - 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 9d6f4850..7362fd63 100644 --- a/node_modules/c9/skip-analytics.js +++ b/node_modules/c9/skip-analytics.js @@ -6,15 +6,12 @@ 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)) 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 bfaf1215..300251b0 100644 --- a/node_modules/c9/skip-analytics_test.js +++ b/node_modules/c9/skip-analytics_test.js @@ -22,25 +22,6 @@ 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()