diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/angular-mocksSpec.js | 52 | ||||
| -rw-r--r-- | test/matchers.js | 2 | ||||
| -rw-r--r-- | test/scenario/RunnerSpec.js | 4 | ||||
| -rw-r--r-- | test/service/cookiesSpec.js | 2 | ||||
| -rw-r--r-- | test/service/filter/filtersSpec.js | 8 | ||||
| -rw-r--r-- | test/service/logSpec.js | 2 | ||||
| -rw-r--r-- | test/testabilityPatch.js | 6 |
7 files changed, 39 insertions, 37 deletions
diff --git a/test/angular-mocksSpec.js b/test/angular-mocksSpec.js index 7b28c408..4073f7fb 100644 --- a/test/angular-mocksSpec.js +++ b/test/angular-mocksSpec.js @@ -8,95 +8,95 @@ describe('mocks', function() { } it('should look like a Date', function() { - var date = new angular.mock.TzDate(0,0); + var date = new angular.module.NG_MOCK.TzDate(0,0); expect(angular.isDate(date)).toBe(true); }); it('should take millis as constructor argument', function() { - expect(new angular.mock.TzDate(0, 0).getTime()).toBe(0); - expect(new angular.mock.TzDate(0, 1283555108000).getTime()).toBe(1283555108000); + expect(new angular.module.NG_MOCK.TzDate(0, 0).getTime()).toBe(0); + expect(new angular.module.NG_MOCK.TzDate(0, 1283555108000).getTime()).toBe(1283555108000); }); it('should take dateString as constructor argument', function() { - expect(new angular.mock.TzDate(0, '1970-01-01T00:00:00.000Z').getTime()).toBe(0); - expect(new angular.mock.TzDate(0, '2010-09-03T23:05:08.023Z').getTime()).toBe(1283555108023); + expect(new angular.module.NG_MOCK.TzDate(0, '1970-01-01T00:00:00.000Z').getTime()).toBe(0); + expect(new angular.module.NG_MOCK.TzDate(0, '2010-09-03T23:05:08.023Z').getTime()).toBe(1283555108023); }); it('should fake getLocalDateString method', function() { //0 in -3h - var t0 = new angular.mock.TzDate(-3, 0); + var t0 = new angular.module.NG_MOCK.TzDate(-3, 0); expect(t0.toLocaleDateString()).toMatch('1970'); //0 in +0h - var t1 = new angular.mock.TzDate(0, 0); + var t1 = new angular.module.NG_MOCK.TzDate(0, 0); expect(t1.toLocaleDateString()).toMatch('1970'); //0 in +3h - var t2 = new angular.mock.TzDate(3, 0); + var t2 = new angular.module.NG_MOCK.TzDate(3, 0); expect(t2.toLocaleDateString()).toMatch('1969'); }); it('should fake getHours method', function() { //0 in -3h - var t0 = new angular.mock.TzDate(-3, 0); + var t0 = new angular.module.NG_MOCK.TzDate(-3, 0); expect(t0.getHours()).toBe(3); //0 in +0h - var t1 = new angular.mock.TzDate(0, 0); + var t1 = new angular.module.NG_MOCK.TzDate(0, 0); expect(t1.getHours()).toBe(0); //0 in +3h - var t2 = new angular.mock.TzDate(3, 0); + var t2 = new angular.module.NG_MOCK.TzDate(3, 0); expect(t2.getHours()).toMatch(21); }); it('should fake getMinutes method', function() { //0:15 in -3h - var t0 = new angular.mock.TzDate(-3, minutes(15)); + var t0 = new angular.module.NG_MOCK.TzDate(-3, minutes(15)); expect(t0.getMinutes()).toBe(15); //0:15 in -3.25h - var t0a = new angular.mock.TzDate(-3.25, minutes(15)); + var t0a = new angular.module.NG_MOCK.TzDate(-3.25, minutes(15)); expect(t0a.getMinutes()).toBe(30); //0 in +0h - var t1 = new angular.mock.TzDate(0, minutes(0)); + var t1 = new angular.module.NG_MOCK.TzDate(0, minutes(0)); expect(t1.getMinutes()).toBe(0); //0:15 in +0h - var t1a = new angular.mock.TzDate(0, minutes(15)); + var t1a = new angular.module.NG_MOCK.TzDate(0, minutes(15)); expect(t1a.getMinutes()).toBe(15); //0:15 in +3h - var t2 = new angular.mock.TzDate(3, minutes(15)); + var t2 = new angular.module.NG_MOCK.TzDate(3, minutes(15)); expect(t2.getMinutes()).toMatch(15); //0:15 in +3.25h - var t2a = new angular.mock.TzDate(3.25, minutes(15)); + var t2a = new angular.module.NG_MOCK.TzDate(3.25, minutes(15)); expect(t2a.getMinutes()).toMatch(0); }); it('should fake getSeconds method', function() { //0 in -3h - var t0 = new angular.mock.TzDate(-3, 0); + var t0 = new angular.module.NG_MOCK.TzDate(-3, 0); expect(t0.getSeconds()).toBe(0); //0 in +0h - var t1 = new angular.mock.TzDate(0, 0); + var t1 = new angular.module.NG_MOCK.TzDate(0, 0); expect(t1.getSeconds()).toBe(0); //0 in +3h - var t2 = new angular.mock.TzDate(3, 0); + var t2 = new angular.module.NG_MOCK.TzDate(3, 0); expect(t2.getSeconds()).toMatch(0); }); it('should create a date representing new year in Bratislava', function() { - var newYearInBratislava = new angular.mock.TzDate(-1, '2009-12-31T23:00:00.000Z'); + var newYearInBratislava = new angular.module.NG_MOCK.TzDate(-1, '2009-12-31T23:00:00.000Z'); expect(newYearInBratislava.getTimezoneOffset()).toBe(-60); expect(newYearInBratislava.getFullYear()).toBe(2010); expect(newYearInBratislava.getMonth()).toBe(0); @@ -108,7 +108,7 @@ describe('mocks', function() { it('should delegate all the UTC methods to the original UTC Date object', function() { //from when created from string - var date1 = new angular.mock.TzDate(-1, '2009-12-31T23:00:00.000Z'); + var date1 = new angular.module.NG_MOCK.TzDate(-1, '2009-12-31T23:00:00.000Z'); expect(date1.getUTCFullYear()).toBe(2009); expect(date1.getUTCMonth()).toBe(11); expect(date1.getUTCDate()).toBe(31); @@ -118,7 +118,7 @@ describe('mocks', function() { //from when created from millis - var date2 = new angular.mock.TzDate(-1, date1.getTime()); + var date2 = new angular.module.NG_MOCK.TzDate(-1, date1.getTime()); expect(date2.getUTCFullYear()).toBe(2009); expect(date2.getUTCMonth()).toBe(11); expect(date2.getUTCDate()).toBe(31); @@ -129,7 +129,7 @@ describe('mocks', function() { it('should throw error when no third param but toString called', function() { - expect(function() { new angular.mock.TzDate(0,0).toString(); }). + expect(function() { new angular.module.NG_MOCK.TzDate(0,0).toString(); }). toThrow('Method \'toString\' is not implemented in the TzDate mock'); }); }); @@ -290,8 +290,8 @@ describe('mocks', function() { }); - describe('angular.mock.debug', function(){ - var d = angular.mock.dump; + describe('angular.module.NG_MOCK.dump', function(){ + var d = angular.module.NG_MOCK.dump; it('should serialize primitive types', function(){ diff --git a/test/matchers.js b/test/matchers.js index fbe86a5a..e7fd202a 100644 --- a/test/matchers.js +++ b/test/matchers.js @@ -95,7 +95,7 @@ beforeEach(function() { toHaveClass: function(clazz) { this.message = function() { - return "Expected '" + angular.mock.dump(this.actual) + "' to have class '" + clazz + "'."; + return "Expected '" + angular.module.NG_MOCK.dump(this.actual) + "' to have class '" + clazz + "'."; }; return this.actual.hasClass ? this.actual.hasClass(clazz) : diff --git a/test/scenario/RunnerSpec.js b/test/scenario/RunnerSpec.js index 15bcc4b0..db47db87 100644 --- a/test/scenario/RunnerSpec.js +++ b/test/scenario/RunnerSpec.js @@ -46,8 +46,8 @@ describe('angular.scenario.Runner', function() { runner.createSpecRunner_ = function(scope) { return scope.$new(MockSpecRunner); }; - runner.on('SpecError', angular.mock.rethrow); - runner.on('StepError', angular.mock.rethrow); + runner.on('SpecError', angular.module.NG_MOCK.rethrow); + runner.on('StepError', angular.module.NG_MOCK.rethrow); }); afterEach(function() { diff --git a/test/service/cookiesSpec.js b/test/service/cookiesSpec.js index d73923a6..c619cf1a 100644 --- a/test/service/cookiesSpec.js +++ b/test/service/cookiesSpec.js @@ -3,7 +3,7 @@ describe('$cookies', function() { beforeEach(inject(function($provide) { $provide.factory('$browser', function(){ - return angular.extend(new angular.mock.$Browser(), {cookieHash: {preexisting:'oldCookie'}}); + return angular.extend(new angular.module.NG_MOCK.$Browser(), {cookieHash: {preexisting:'oldCookie'}}); }); })); diff --git a/test/service/filter/filtersSpec.js b/test/service/filter/filtersSpec.js index ca510a72..8d05d951 100644 --- a/test/service/filter/filtersSpec.js +++ b/test/service/filter/filtersSpec.js @@ -187,10 +187,10 @@ describe('filters', function() { describe('date', function() { - var morning = new angular.mock.TzDate(+5, '2010-09-03T12:05:08.000Z'); //7am - var noon = new angular.mock.TzDate(+5, '2010-09-03T17:05:08.000Z'); //12pm - var midnight = new angular.mock.TzDate(+5, '2010-09-03T05:05:08.000Z'); //12am - var earlyDate = new angular.mock.TzDate(+5, '0001-09-03T05:05:08.000Z'); + var morning = new angular.module.NG_MOCK.TzDate(+5, '2010-09-03T12:05:08.000Z'); //7am + var noon = new angular.module.NG_MOCK.TzDate(+5, '2010-09-03T17:05:08.000Z'); //12pm + var midnight = new angular.module.NG_MOCK.TzDate(+5, '2010-09-03T05:05:08.000Z'); //12am + var earlyDate = new angular.module.NG_MOCK.TzDate(+5, '0001-09-03T05:05:08.000Z'); var date; diff --git a/test/service/logSpec.js b/test/service/logSpec.js index ee250b66..e81ac851 100644 --- a/test/service/logSpec.js +++ b/test/service/logSpec.js @@ -13,7 +13,7 @@ describe('$log', function() { $window = {}; logger = ''; $provide.service('$log', $LogProvider); - $provide.value('$exceptionHandler', angular.mock.rethrow); + $provide.value('$exceptionHandler', angular.module.NG_MOCK.rethrow); $provide.value('$window', $window); })); diff --git a/test/testabilityPatch.js b/test/testabilityPatch.js index b2bcb519..83851289 100644 --- a/test/testabilityPatch.js +++ b/test/testabilityPatch.js @@ -174,10 +174,12 @@ function isCssVisible(node) { } function assertHidden(node) { - assertFalse("Node should be hidden but vas visible: " + angular.mock.dump(node), isCssVisible(node)); + assertFalse("Node should be hidden but vas visible: " + + angular.module.NG_MOCK.dump(node), isCssVisible(node)); } function assertVisible(node) { - assertTrue("Node should be visible but vas hidden: " + angular.mock.dump(node), isCssVisible(node)); + assertTrue("Node should be visible but vas hidden: " + + angular.module.NG_MOCK.dump(node), isCssVisible(node)); } |
