From 514accebd322080432c0729bb4962521691dda5a Mon Sep 17 00:00:00 2001 From: Pablo Barrales C Date: Sat, 17 Dec 2016 03:35:24 -0300 Subject: [PATCH 1/7] fix - Update from .analytics to .ga.analytics --- src/plugins/googleAnalytics.js | 20 ++++----- test/plugins/googleAnalytics.spec.js | 62 ++++++++++++++-------------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/plugins/googleAnalytics.js b/src/plugins/googleAnalytics.js index 1bec1adf..66fd6bde 100755 --- a/src/plugins/googleAnalytics.js +++ b/src/plugins/googleAnalytics.js @@ -9,7 +9,7 @@ angular.module('ngCordova.plugins.googleAnalytics', []) startTrackerWithId: function (id) { var d = $q.defer(); - $window.analytics.startTrackerWithId(id, function (response) { + $window.ga.analytics.startTrackerWithId(id, function (response) { d.resolve(response); }, function (error) { d.reject(error); @@ -21,7 +21,7 @@ angular.module('ngCordova.plugins.googleAnalytics', []) setUserId: function (id) { var d = $q.defer(); - $window.analytics.setUserId(id, function (response) { + $window.ga.analytics.setUserId(id, function (response) { d.resolve(response); }, function (error) { d.reject(error); @@ -33,7 +33,7 @@ angular.module('ngCordova.plugins.googleAnalytics', []) debugMode: function () { var d = $q.defer(); - $window.analytics.debugMode(function (response) { + $window.ga.analytics.debugMode(function (response) { d.resolve(response); }, function () { d.reject(); @@ -45,7 +45,7 @@ angular.module('ngCordova.plugins.googleAnalytics', []) trackView: function (screenName) { var d = $q.defer(); - $window.analytics.trackView(screenName, function (response) { + $window.ga.analytics.trackView(screenName, function (response) { d.resolve(response); }, function (error) { d.reject(error); @@ -62,7 +62,7 @@ angular.module('ngCordova.plugins.googleAnalytics', []) d.reject('Parameter "key" must be an integer.'); } - $window.analytics.addCustomDimension(parsedKey, value, function () { + $window.ga.analytics.addCustomDimension(parsedKey, value, function () { d.resolve(); }, function (error) { d.reject(error); @@ -74,7 +74,7 @@ angular.module('ngCordova.plugins.googleAnalytics', []) trackEvent: function (category, action, label, value) { var d = $q.defer(); - $window.analytics.trackEvent(category, action, label, value, function (response) { + $window.ga.analytics.trackEvent(category, action, label, value, function (response) { d.resolve(response); }, function (error) { d.reject(error); @@ -86,7 +86,7 @@ angular.module('ngCordova.plugins.googleAnalytics', []) trackException: function (description, fatal) { var d = $q.defer(); - $window.analytics.trackException(description, fatal, function (response) { + $window.ga.analytics.trackException(description, fatal, function (response) { d.resolve(response); }, function (error) { d.reject(error); @@ -98,7 +98,7 @@ angular.module('ngCordova.plugins.googleAnalytics', []) trackTiming: function (category, milliseconds, variable, label) { var d = $q.defer(); - $window.analytics.trackTiming(category, milliseconds, variable, label, function (response) { + $window.ga.analytics.trackTiming(category, milliseconds, variable, label, function (response) { d.resolve(response); }, function (error) { d.reject(error); @@ -110,7 +110,7 @@ angular.module('ngCordova.plugins.googleAnalytics', []) addTransaction: function (transactionId, affiliation, revenue, tax, shipping, currencyCode) { var d = $q.defer(); - $window.analytics.addTransaction(transactionId, affiliation, revenue, tax, shipping, currencyCode, function (response) { + $window.ga.analytics.addTransaction(transactionId, affiliation, revenue, tax, shipping, currencyCode, function (response) { d.resolve(response); }, function (error) { d.reject(error); @@ -122,7 +122,7 @@ angular.module('ngCordova.plugins.googleAnalytics', []) addTransactionItem: function (transactionId, name, sku, category, price, quantity, currencyCode) { var d = $q.defer(); - $window.analytics.addTransactionItem(transactionId, name, sku, category, price, quantity, currencyCode, function (response) { + $window.ga.analytics.addTransactionItem(transactionId, name, sku, category, price, quantity, currencyCode, function (response) { d.resolve(response); }, function (error) { d.reject(error); diff --git a/test/plugins/googleAnalytics.spec.js b/test/plugins/googleAnalytics.spec.js index c8430f0e..e2e2a3b7 100644 --- a/test/plugins/googleAnalytics.spec.js +++ b/test/plugins/googleAnalytics.spec.js @@ -9,7 +9,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { $window = _$window_; $rootScope = _$rootScope_; - $window.analytics = { + $window.ga.analytics = { startTrackerWithId: angular.noop, setUserId: angular.noop, debugMode: angular.noop, @@ -27,7 +27,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { var result; - spyOn($window.analytics, 'startTrackerWithId') + spyOn($window.ga.analytics, 'startTrackerWithId') .and.callFake(function (id, successCb, errorCb) { successCb('tracker started'); }); @@ -41,14 +41,14 @@ describe('Service: $cordovaGoogleAnalytics', function() { $rootScope.$digest(); expect(result).toBe('tracker started'); - expect($window.analytics.startTrackerWithId.calls.argsFor(0)[0]).toBe('UA-000000-01'); + expect($window.ga.analytics.startTrackerWithId.calls.argsFor(0)[0]).toBe('UA-000000-01'); }); it('should call errorCb when in $window\'s analytics.startTrackerWithId a error orccurs', function() { var result; - spyOn($window.analytics, 'startTrackerWithId') + spyOn($window.ga.analytics, 'startTrackerWithId') .and.callFake(function (id, successCb, errorCb) { errorCb('tracker id is not valid'); }); @@ -67,7 +67,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { var result; - spyOn($window.analytics, 'setUserId') + spyOn($window.ga.analytics, 'setUserId') .and.callFake(function (id, successCb, errorCb) { successCb('Set user id: ' + id); }); @@ -81,14 +81,14 @@ describe('Service: $cordovaGoogleAnalytics', function() { $rootScope.$digest(); expect(result).toBe('Set user id: USER_ID'); - expect($window.analytics.setUserId.calls.argsFor(0)[0]).toBe('USER_ID'); + expect($window.ga.analytics.setUserId.calls.argsFor(0)[0]).toBe('USER_ID'); }); it('should call errorCb when in $window\'s analytics.setUserId a error orccurs', function() { var result; - spyOn($window.analytics, 'setUserId') + spyOn($window.ga.analytics, 'setUserId') .and.callFake(function (id, successCb, errorCb) { errorCb('Tracker not started'); }); @@ -107,7 +107,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { var result; - spyOn($window.analytics, 'debugMode') + spyOn($window.ga.analytics, 'debugMode') .and.callFake(function (successCb, errorCb) { successCb('debugMode enabled'); }); @@ -127,7 +127,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { var result; - spyOn($window.analytics, 'debugMode') + spyOn($window.ga.analytics, 'debugMode') .and.callFake(function (successCb, errorCb) { errorCb(); }); @@ -146,7 +146,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { var result; - spyOn($window.analytics, 'trackView') + spyOn($window.ga.analytics, 'trackView') .and.callFake(function (screenName, successCb, errorCb) { successCb('Track Screen: ' + screenName); }); @@ -160,14 +160,14 @@ describe('Service: $cordovaGoogleAnalytics', function() { $rootScope.$digest(); expect(result).toBe('Track Screen: Home Screen'); - expect($window.analytics.trackView.calls.argsFor(0)[0]).toBe('Home Screen'); + expect($window.ga.analytics.trackView.calls.argsFor(0)[0]).toBe('Home Screen'); }); it('should call errorCb when in $window\'s analytics.trackView a error orccurs', function() { var result; - spyOn($window.analytics, 'trackView') + spyOn($window.ga.analytics, 'trackView') .and.callFake(function (screenName, successCb, errorCb) { errorCb('Expected one non-empty string argument'); }); @@ -186,7 +186,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { var result; - spyOn($window.analytics, 'addCustomDimension') + spyOn($window.ga.analytics, 'addCustomDimension') .and.callFake(function (key, value, successCb, errorCb) { successCb(); }); @@ -200,15 +200,15 @@ describe('Service: $cordovaGoogleAnalytics', function() { $rootScope.$digest(); expect(result).toBe('success'); - expect($window.analytics.addCustomDimension.calls.argsFor(0)[0]).toBe(1); - expect($window.analytics.addCustomDimension.calls.argsFor(0)[1]).toBe('Level 1'); + expect($window.ga.analytics.addCustomDimension.calls.argsFor(0)[0]).toBe(1); + expect($window.ga.analytics.addCustomDimension.calls.argsFor(0)[1]).toBe('Level 1'); }); it('should call errorCb when in $window\'s analytics.addCustomDimension a error orccurs', function() { var result; - spyOn($window.analytics, 'addCustomDimension') + spyOn($window.ga.analytics, 'addCustomDimension') .and.callFake(function (key, value, successCb, errorCb) { errorCb('Parameter "key" must be an integer.'); }); @@ -227,7 +227,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { var result; - spyOn($window.analytics, 'trackEvent') + spyOn($window.ga.analytics, 'trackEvent') .and.callFake(function (category, action, label, value, successCb, errorCb) { successCb('Track Event: ' + category); }); @@ -241,7 +241,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { $rootScope.$digest(); expect(result).toBe('Track Event: Videos'); - expect($window.analytics.trackEvent).toHaveBeenCalledWith( + expect($window.ga.analytics.trackEvent).toHaveBeenCalledWith( 'Videos', 'Video Load Time', 'Gone With the Wind', 100, jasmine.any(Function), jasmine.any(Function) @@ -252,7 +252,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { var result; - spyOn($window.analytics, 'trackEvent') + spyOn($window.ga.analytics, 'trackEvent') .and.callFake(function (category, action, label, value, successCb, errorCb) { errorCb('Tracker not started'); }); @@ -272,7 +272,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { var result; - spyOn($window.analytics, 'trackException') + spyOn($window.ga.analytics, 'trackException') .and.callFake(function (description, fatal, successCb, errorCb) { successCb('Track Exception: ' + description); }); @@ -286,7 +286,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { $rootScope.$digest(); expect(result).toBe('Track Exception: Video player exception'); - expect($window.analytics.trackException).toHaveBeenCalledWith( + expect($window.ga.analytics.trackException).toHaveBeenCalledWith( 'Video player exception', false, jasmine.any(Function), jasmine.any(Function) @@ -297,7 +297,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { var result; - spyOn($window.analytics, 'trackException') + spyOn($window.ga.analytics, 'trackException') .and.callFake(function (description, fatal, successCb, errorCb) { errorCb('Tracker not started'); }); @@ -317,7 +317,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { var result; - spyOn($window.analytics, 'trackTiming') + spyOn($window.ga.analytics, 'trackTiming') .and.callFake(function (category, milliseconds, variable, label, successCb, errorCb) { successCb('Track Timing: ' + category); }); @@ -331,7 +331,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { $rootScope.$digest(); expect(result).toBe('Track Timing: Videos'); - expect($window.analytics.trackTiming).toHaveBeenCalledWith( + expect($window.ga.analytics.trackTiming).toHaveBeenCalledWith( 'Videos', 100, 'Video Load Time', 'Gone With the Wind', jasmine.any(Function), jasmine.any(Function) @@ -342,7 +342,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { var result; - spyOn($window.analytics, 'trackTiming') + spyOn($window.ga.analytics, 'trackTiming') .and.callFake(function (category, milliseconds, variable, label, successCb, errorCb) { errorCb('Tracker not started'); }); @@ -362,7 +362,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { var result; - spyOn($window.analytics, 'addTransaction') + spyOn($window.ga.analytics, 'addTransaction') .and.callFake(function (transactionId, affiliation, revenue, tax, shipping, currencyCode, successCb, errorCb) { successCb('Add Transaction: ' + transactionId); }); @@ -376,7 +376,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { $rootScope.$digest(); expect(result).toBe('Add Transaction: 1234'); - expect($window.analytics.addTransaction).toHaveBeenCalledWith( + expect($window.ga.analytics.addTransaction).toHaveBeenCalledWith( '1234', 'Acme Clothing', '11.99', '5', '1.29', 'EUR', jasmine.any(Function), jasmine.any(Function) @@ -387,7 +387,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { var result; - spyOn($window.analytics, 'addTransaction') + spyOn($window.ga.analytics, 'addTransaction') .and.callFake(function (transactionId, affiliation, revenue, tax, shipping, currencyCode, successCb, errorCb) { errorCb('Tracker not started'); }); @@ -406,7 +406,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { var result; - spyOn($window.analytics, 'addTransactionItem') + spyOn($window.ga.analytics, 'addTransactionItem') .and.callFake(function (transactionId, name ,sku, category, price, quantity, currencyCode, successCb, errorCb) { successCb('Add Transaction Item: ' + transactionId); }); @@ -420,7 +420,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { $rootScope.$digest(); expect(result).toBe('Add Transaction Item: 1234'); - expect($window.analytics.addTransactionItem).toHaveBeenCalledWith( + expect($window.ga.analytics.addTransactionItem).toHaveBeenCalledWith( '1234', 'Fluffy Pink Bunnies', 'DD23444', 'Party Toys', '11.99', '1', 'GBP', jasmine.any(Function), jasmine.any(Function) @@ -431,7 +431,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { var result; - spyOn($window.analytics, 'addTransactionItem') + spyOn($window.ga.analytics, 'addTransactionItem') .and.callFake(function (transactionId, name ,sku, category, price, quantity, currencyCode, successCb, errorCb) { errorCb('Tracker not started'); }); From 0dee3d5403e384a6888adbde21487dd3930def0b Mon Sep 17 00:00:00 2001 From: Pablo Barrales C Date: Sat, 17 Dec 2016 04:38:14 -0300 Subject: [PATCH 2/7] Testing GoogleAnalytics --- src/mocks/googleAnalytics.js | 8 ++++-- test/mocks/googleAnalytics.spec.js | 4 +-- test/plugins/googleAnalytics.spec.js | 41 +++++++++++++++++++++++----- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/src/mocks/googleAnalytics.js b/src/mocks/googleAnalytics.js index 4d15e8de..ffd28ca9 100644 --- a/src/mocks/googleAnalytics.js +++ b/src/mocks/googleAnalytics.js @@ -8,7 +8,9 @@ */ ngCordovaMocks.factory('$cordovaGoogleAnalytics', ['$q', function ($q) { var throwsError = false; - var methods = {}; + var methods = { + ga: {} + }; /** * @ngdoc property @@ -19,7 +21,7 @@ ngCordovaMocks.factory('$cordovaGoogleAnalytics', ['$q', function ($q) { * A flag that signals whether a promise should be rejected or not. * This property should only be used in automated tests. **/ - methods.throwsError = throwsError; + methods.ga.throwsError = throwsError; var methodsName = [ 'startTrackerWithId', @@ -35,7 +37,7 @@ ngCordovaMocks.factory('$cordovaGoogleAnalytics', ['$q', function ($q) { ]; methodsName.forEach(function (funcName) { - methods[funcName] = function () { + methods.ga[funcName] = function () { var defer = $q.defer(); (this.throwsError) ? diff --git a/test/mocks/googleAnalytics.spec.js b/test/mocks/googleAnalytics.spec.js index 23a4442d..f7e048b5 100644 --- a/test/mocks/googleAnalytics.spec.js +++ b/test/mocks/googleAnalytics.spec.js @@ -13,7 +13,7 @@ describe('ngCordovaMocks', function() { })); var testPromises = function testPromises(funcName) { - $cordovaGoogleAnalytics[funcName](1) + $cordovaGoogleAnalytics.ga[funcName](1) .then( function() { expect(true).toBe(true); }, function() { expect(false).toBe(true); } @@ -22,7 +22,7 @@ describe('ngCordovaMocks', function() { $timeout.flush(); $cordovaGoogleAnalytics.throwsError = true; - $cordovaGoogleAnalytics[funcName](1) + $cordovaGoogleAnalytics.ga[funcName](1) .then( function() { expect(false).toBe(true); }, function() { expect(true).toBe(true); } diff --git a/test/plugins/googleAnalytics.spec.js b/test/plugins/googleAnalytics.spec.js index e2e2a3b7..dad22ed9 100644 --- a/test/plugins/googleAnalytics.spec.js +++ b/test/plugins/googleAnalytics.spec.js @@ -33,6 +33,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics + .ga .startTrackerWithId('UA-000000-01') .then(function (response) { result = response; @@ -53,7 +54,9 @@ describe('Service: $cordovaGoogleAnalytics', function() { errorCb('tracker id is not valid'); }); - $cordovaGoogleAnalytics.startTrackerWithId() + $cordovaGoogleAnalytics + .ga + .startTrackerWithId() .then(angular.noop, function (response) { result = response; }); @@ -73,6 +76,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics + .ga .setUserId('USER_ID') .then(function (response) { result = response; @@ -93,7 +97,9 @@ describe('Service: $cordovaGoogleAnalytics', function() { errorCb('Tracker not started'); }); - $cordovaGoogleAnalytics.setUserId() + $cordovaGoogleAnalytics + .ga + .setUserId() .then(angular.noop, function (response) { result = response; }); @@ -113,6 +119,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics + .ga .debugMode() .then(function (response) { result = response; @@ -132,7 +139,9 @@ describe('Service: $cordovaGoogleAnalytics', function() { errorCb(); }); - $cordovaGoogleAnalytics.debugMode() + $cordovaGoogleAnalytics + .ga + .debugMode() .then(angular.noop, function (response) { result = 'error orccurs'; }); @@ -152,6 +161,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics + .ga .trackView('Home Screen') .then(function (response) { result = response; @@ -172,7 +182,9 @@ describe('Service: $cordovaGoogleAnalytics', function() { errorCb('Expected one non-empty string argument'); }); - $cordovaGoogleAnalytics.trackView() + $cordovaGoogleAnalytics + .ga + .trackView() .then(angular.noop, function (response) { result = response; }); @@ -192,6 +204,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics + .ga .addCustomDimension(1, 'Level 1') .then(function (response) { result = 'success'; @@ -213,7 +226,9 @@ describe('Service: $cordovaGoogleAnalytics', function() { errorCb('Parameter "key" must be an integer.'); }); - $cordovaGoogleAnalytics.addCustomDimension() + $cordovaGoogleAnalytics + .ga + .addCustomDimension() .then(angular.noop, function (response) { result = response; }); @@ -233,6 +248,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics + .ga .trackEvent('Videos', 'Video Load Time', 'Gone With the Wind', 100) .then(function (response) { result = response; @@ -258,6 +274,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics + .ga .trackEvent() .then(angular.noop, function (response) { result = response; @@ -278,6 +295,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics + .ga .trackException('Video player exception', false) .then(function (response) { result = response; @@ -303,6 +321,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics + .ga .trackException() .then(angular.noop, function (response) { result = response; @@ -323,6 +342,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics + .ga .trackTiming('Videos', 100, 'Video Load Time', 'Gone With the Wind') .then(function (response) { result = response; @@ -348,6 +368,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics + .ga .trackTiming() .then(angular.noop, function (response) { result = response; @@ -368,6 +389,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics + .ga .addTransaction('1234', 'Acme Clothing', '11.99', '5', '1.29', 'EUR') .then(function (response) { result = response; @@ -392,7 +414,9 @@ describe('Service: $cordovaGoogleAnalytics', function() { errorCb('Tracker not started'); }); - $cordovaGoogleAnalytics.addTransaction() + $cordovaGoogleAnalytic + .ga + .addTransaction() .then(angular.noop, function (response) { result = response; }); @@ -412,6 +436,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics + .ga .addTransactionItem('1234', 'Fluffy Pink Bunnies', 'DD23444', 'Party Toys', '11.99', '1', 'GBP') .then(function (response) { result = response; @@ -436,7 +461,9 @@ describe('Service: $cordovaGoogleAnalytics', function() { errorCb('Tracker not started'); }); - $cordovaGoogleAnalytics.addTransactionItem() + $cordovaGoogleAnalytics + .ga + .addTransactionItem() .then(angular.noop, function (response) { result = response; }); From 0c17aaa2b4bb1c05c1fe34077d311921147527b6 Mon Sep 17 00:00:00 2001 From: Pablo Barrales C Date: Sat, 17 Dec 2016 04:45:49 -0300 Subject: [PATCH 3/7] .analytics to .ga.analytics --- test/plugins/googleAnalytics.spec.js | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/test/plugins/googleAnalytics.spec.js b/test/plugins/googleAnalytics.spec.js index dad22ed9..fec1bf09 100644 --- a/test/plugins/googleAnalytics.spec.js +++ b/test/plugins/googleAnalytics.spec.js @@ -9,17 +9,19 @@ describe('Service: $cordovaGoogleAnalytics', function() { $window = _$window_; $rootScope = _$rootScope_; - $window.ga.analytics = { - startTrackerWithId: angular.noop, - setUserId: angular.noop, - debugMode: angular.noop, - trackView: angular.noop, - addCustomDimension: angular.noop, - trackEvent: angular.noop, - trackException: angular.noop, - trackTiming: angular.noop, - addTransaction: angular.noop, - addTransactionItem: angular.noop, + $window.ga: { + analytics = { + startTrackerWithId: angular.noop, + setUserId: angular.noop, + debugMode: angular.noop, + trackView: angular.noop, + addCustomDimension: angular.noop, + trackEvent: angular.noop, + trackException: angular.noop, + trackTiming: angular.noop, + addTransaction: angular.noop, + addTransactionItem: angular.noop, + } }; })); From 15486a190beb0c5e80ae4e06d7750c9bdc2d1a7e Mon Sep 17 00:00:00 2001 From: Pablo Barrales C Date: Sat, 17 Dec 2016 04:51:33 -0300 Subject: [PATCH 4/7] .analytics to .ga.analytics. SyntaxError --- test/plugins/googleAnalytics.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/plugins/googleAnalytics.spec.js b/test/plugins/googleAnalytics.spec.js index fec1bf09..84a21c7d 100644 --- a/test/plugins/googleAnalytics.spec.js +++ b/test/plugins/googleAnalytics.spec.js @@ -9,8 +9,8 @@ describe('Service: $cordovaGoogleAnalytics', function() { $window = _$window_; $rootScope = _$rootScope_; - $window.ga: { - analytics = { + $window.ga = { + analytics: { startTrackerWithId: angular.noop, setUserId: angular.noop, debugMode: angular.noop, From 17bff046d682135026db062c955bd16286d7df29 Mon Sep 17 00:00:00 2001 From: Pablo Barrales C Date: Sat, 17 Dec 2016 05:00:38 -0300 Subject: [PATCH 5/7] $window.analytics to $window.ga.analytics. Testing --- src/mocks/googleAnalytics.js | 2 +- test/plugins/googleAnalytics.spec.js | 22 +--------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/mocks/googleAnalytics.js b/src/mocks/googleAnalytics.js index ffd28ca9..bc1f9475 100644 --- a/src/mocks/googleAnalytics.js +++ b/src/mocks/googleAnalytics.js @@ -48,5 +48,5 @@ ngCordovaMocks.factory('$cordovaGoogleAnalytics', ['$q', function ($q) { }; }); - return methods; + return methods.ga; }]); diff --git a/test/plugins/googleAnalytics.spec.js b/test/plugins/googleAnalytics.spec.js index 84a21c7d..de5f2180 100644 --- a/test/plugins/googleAnalytics.spec.js +++ b/test/plugins/googleAnalytics.spec.js @@ -22,7 +22,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { addTransaction: angular.noop, addTransactionItem: angular.noop, } - }; + } })); it('should call $window\'s analytics.startTrackerWithId method', function() { @@ -35,7 +35,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .startTrackerWithId('UA-000000-01') .then(function (response) { result = response; @@ -57,7 +56,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .startTrackerWithId() .then(angular.noop, function (response) { result = response; @@ -78,7 +76,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .setUserId('USER_ID') .then(function (response) { result = response; @@ -100,7 +97,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .setUserId() .then(angular.noop, function (response) { result = response; @@ -121,7 +117,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .debugMode() .then(function (response) { result = response; @@ -142,7 +137,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .debugMode() .then(angular.noop, function (response) { result = 'error orccurs'; @@ -163,7 +157,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .trackView('Home Screen') .then(function (response) { result = response; @@ -185,7 +178,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .trackView() .then(angular.noop, function (response) { result = response; @@ -206,7 +198,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .addCustomDimension(1, 'Level 1') .then(function (response) { result = 'success'; @@ -229,7 +220,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .addCustomDimension() .then(angular.noop, function (response) { result = response; @@ -250,7 +240,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .trackEvent('Videos', 'Video Load Time', 'Gone With the Wind', 100) .then(function (response) { result = response; @@ -276,7 +265,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .trackEvent() .then(angular.noop, function (response) { result = response; @@ -297,7 +285,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .trackException('Video player exception', false) .then(function (response) { result = response; @@ -323,7 +310,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .trackException() .then(angular.noop, function (response) { result = response; @@ -344,7 +330,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .trackTiming('Videos', 100, 'Video Load Time', 'Gone With the Wind') .then(function (response) { result = response; @@ -370,7 +355,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .trackTiming() .then(angular.noop, function (response) { result = response; @@ -391,7 +375,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .addTransaction('1234', 'Acme Clothing', '11.99', '5', '1.29', 'EUR') .then(function (response) { result = response; @@ -417,7 +400,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytic - .ga .addTransaction() .then(angular.noop, function (response) { result = response; @@ -438,7 +420,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .addTransactionItem('1234', 'Fluffy Pink Bunnies', 'DD23444', 'Party Toys', '11.99', '1', 'GBP') .then(function (response) { result = response; @@ -464,7 +445,6 @@ describe('Service: $cordovaGoogleAnalytics', function() { }); $cordovaGoogleAnalytics - .ga .addTransactionItem() .then(angular.noop, function (response) { result = response; From b96d579eb4cbe77a833e99f24e251928d64939d0 Mon Sep 17 00:00:00 2001 From: Pablo Barrales C Date: Sat, 17 Dec 2016 05:08:40 -0300 Subject: [PATCH 6/7] cordovaGoogleAnalytic to cordovaGoogleAnalytics --- test/mocks/googleAnalytics.spec.js | 4 ++-- test/plugins/googleAnalytics.spec.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/mocks/googleAnalytics.spec.js b/test/mocks/googleAnalytics.spec.js index f7e048b5..23a4442d 100644 --- a/test/mocks/googleAnalytics.spec.js +++ b/test/mocks/googleAnalytics.spec.js @@ -13,7 +13,7 @@ describe('ngCordovaMocks', function() { })); var testPromises = function testPromises(funcName) { - $cordovaGoogleAnalytics.ga[funcName](1) + $cordovaGoogleAnalytics[funcName](1) .then( function() { expect(true).toBe(true); }, function() { expect(false).toBe(true); } @@ -22,7 +22,7 @@ describe('ngCordovaMocks', function() { $timeout.flush(); $cordovaGoogleAnalytics.throwsError = true; - $cordovaGoogleAnalytics.ga[funcName](1) + $cordovaGoogleAnalytics[funcName](1) .then( function() { expect(false).toBe(true); }, function() { expect(true).toBe(true); } diff --git a/test/plugins/googleAnalytics.spec.js b/test/plugins/googleAnalytics.spec.js index de5f2180..a0e87645 100644 --- a/test/plugins/googleAnalytics.spec.js +++ b/test/plugins/googleAnalytics.spec.js @@ -399,7 +399,7 @@ describe('Service: $cordovaGoogleAnalytics', function() { errorCb('Tracker not started'); }); - $cordovaGoogleAnalytic + $cordovaGoogleAnalytics .addTransaction() .then(angular.noop, function (response) { result = response; From f07737a300c9548a5d3f38b78d4cf53434acca70 Mon Sep 17 00:00:00 2001 From: Pablo Barrales C Date: Sat, 17 Dec 2016 09:54:58 -0300 Subject: [PATCH 7/7] Fix toast.spec.js done --- src/plugins/3dtouch.js | 28 ++++++++++++++-------------- src/plugins/serial.js | 12 ++++++------ test/mocks/toast.spec.js | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/plugins/3dtouch.js b/src/plugins/3dtouch.js index 9313569f..9338a79b 100644 --- a/src/plugins/3dtouch.js +++ b/src/plugins/3dtouch.js @@ -3,11 +3,11 @@ angular.module('ngCordova.plugins.3dtouch', []) - .factory('$cordova3DTouch', ['$q', function($q) { + .factory('$cordova3DTouch', ['$q', function ($q) { var quickActions = []; var quickActionHandler = {}; - var createQuickActionHandler = function(quickActionHandler) { + var createQuickActionHandler = function (quickActionHandler) { return function (payload) { for (var key in quickActionHandler) { if (payload.type === key) { @@ -52,7 +52,7 @@ angular.module('ngCordova.plugins.3dtouch', []) * @param function callback (optional) * @return promise */ - addQuickAction: function(type, title, iconType, iconTemplate, subtitle, callback) { + addQuickAction: function (type, title, iconType, iconTemplate, subtitle, callback) { var deferred = $q.defer(); var quickAction = { @@ -69,14 +69,14 @@ angular.module('ngCordova.plugins.3dtouch', []) quickAction.iconTemplate = iconTemplate; } - this.isAvailable().then(function() { + this.isAvailable().then(function () { quickActions.push(quickAction); quickActionHandler[type] = callback; window.ThreeDeeTouch.configureQuickActions(quickActions); window.ThreeDeeTouch.onHomeIconPressed = createQuickActionHandler(quickActionHandler); deferred.resolve(quickActions); }, - function(err) { + function (err) { deferred.reject(err); }); @@ -90,15 +90,15 @@ angular.module('ngCordova.plugins.3dtouch', []) * @param function callback * @return promise */ - addQuickActionHandler: function(type, callback) { + addQuickActionHandler: function (type, callback) { var deferred = $q.defer(); - this.isAvailable().then(function() { + this.isAvailable().then(function () { quickActionHandler[type] = callback; window.ThreeDeeTouch.onHomeIconPressed = createQuickActionHandler(quickActionHandler); deferred.resolve(true); }, - function(err) { + function (err) { deferred.reject(err); }); @@ -110,14 +110,14 @@ angular.module('ngCordova.plugins.3dtouch', []) * * @return bool */ - enableLinkPreview: function() { + enableLinkPreview: function () { var deferred = $q.defer(); - this.isAvailable().then(function() { + this.isAvailable().then(function () { window.ThreeDeeTouch.enableLinkPreview(); deferred.resolve(true); }, - function(err) { + function (err) { deferred.reject(err); }); @@ -130,14 +130,14 @@ angular.module('ngCordova.plugins.3dtouch', []) * @param function callback * @return promise */ - addForceTouchHandler: function(callback) { + addForceTouchHandler: function (callback) { var deferred = $q.defer(); - this.isAvailable().then(function() { + this.isAvailable().then(function () { window.ThreeDeeTouch.watchForceTouches(callback); deferred.resolve(true); }, - function(err) { + function (err) { deferred.reject(err); }); diff --git a/src/plugins/serial.js b/src/plugins/serial.js index 14bd286f..a732be4d 100644 --- a/src/plugins/serial.js +++ b/src/plugins/serial.js @@ -20,7 +20,7 @@ angular.module('ngCordova.plugins.serial', []) return q.promise; }; - serialService.open = function(options) { + serialService.open = function (options) { var q = $q.defer(); serial.open(options, function success() { @@ -32,7 +32,7 @@ angular.module('ngCordova.plugins.serial', []) return q.promise; }; - serialService.write = function(data) { + serialService.write = function (data) { var q = $q.defer(); serial.write(data, function success() { @@ -44,7 +44,7 @@ angular.module('ngCordova.plugins.serial', []) return q.promise; }; - serialService.writeHex = function(data) { + serialService.writeHex = function (data) { var q = $q.defer(); serial.writeHex(data, function success() { @@ -56,7 +56,7 @@ angular.module('ngCordova.plugins.serial', []) return q.promise; }; - serialService.read = function() { + serialService.read = function () { var q = $q.defer(); serial.read(function success(buffer) { @@ -69,14 +69,14 @@ angular.module('ngCordova.plugins.serial', []) return q.promise; }; - serialService.registerReadCallback = function(successCallback, errorCallback) { + serialService.registerReadCallback = function (successCallback, errorCallback) { serial.registerReadCallback(function success(buffer) { var view = new Uint8Array(buffer); successCallback(view); }, errorCallback); }; - serialService.close = function() { + serialService.close = function () { var q = $q.defer(); serial.close(function success() { diff --git a/test/mocks/toast.spec.js b/test/mocks/toast.spec.js index 6e645b69..c0df3799 100644 --- a/test/mocks/toast.spec.js +++ b/test/mocks/toast.spec.js @@ -24,7 +24,7 @@ describe('ngCordovaMocks', function () { $rootScope = _$rootScope_; })); - it('should show a toast', function () { + it('should show a toast', function (done) { functionNames.forEach(function(functionName){ $cordovaToast[functionName](message)