diff --git a/node_modules/c9/has-internal-test-name.js b/node_modules/c9/has-internal-test-name.js index 82f65452..1056d645 100644 --- a/node_modules/c9/has-internal-test-name.js +++ b/node_modules/c9/has-internal-test-name.js @@ -10,12 +10,10 @@ define(function(require, exports, module) { var internalTestNames = ["c9test", "c9 test"]; var regex = new RegExp("^(" + internalTestNames.join("|") + ")+"); - function hasInternalTestName(user) { - if (!user.name && !user.username) return false; + function hasInternalTestName(name) { + if (!name) return false; - var testedName = user.name ? user.name : user.username; - - return regex.test(testedName); + return regex.test(name); } module.exports = hasInternalTestName; diff --git a/node_modules/c9/skip-analytics.js b/node_modules/c9/skip-analytics.js index 31c97dc4..f0f2e024 100644 --- a/node_modules/c9/skip-analytics.js +++ b/node_modules/c9/skip-analytics.js @@ -10,13 +10,19 @@ define(function(require, exports, module) { var hasInternalDomain = require("c9/has-internal-domain"); var hasInternalTestName = require("c9/has-internal-test-name"); - function skipAnalytics(userId, user, allowUnauthorized) { + function skipAnalytics(userId, name, email, allowUnauthorized) { + + if (typeof userId == "object" && !name) { + var user = userId; + return skipAnalytics(user.id, user.name || user.username, user.email); // make it backwards for the client + } + if (!allowUnauthorized && userId === -1) return true; - if (!userId || !user) return true; + if (!userId) return true; - if (hasInternalTestName(user)) return true; - if (hasInternalDomain(user.email)) return true; + if (hasInternalTestName(name)) return true; + if (hasInternalDomain(email)) return true; return false; } diff --git a/plugins/c9.analytics/mock_analytics.js b/plugins/c9.analytics/mock_analytics.js index ca17303f..c8bb3c06 100644 --- a/plugins/c9.analytics/mock_analytics.js +++ b/plugins/c9.analytics/mock_analytics.js @@ -12,11 +12,11 @@ function plugin(options, imports, register) { register(null, { "analytics": { - log: function() {}, track: function() {}, identify: function() {}, - logClean: function() {}, - trackClean: function() {} + updateTraits: function() {}, + alias: function() {}, + logClean: function() {} // huh?? } }); } \ No newline at end of file