diff options
| author | Tobias Bosch | 2013-11-21 14:30:50 -0800 |
|---|---|---|
| committer | Tobias Bosch | 2013-11-21 21:53:09 -0800 |
| commit | 579242346c4202ea58fc2cae6df232289cbea0bb (patch) | |
| tree | c2ef1ed6020f93994a080d13871c636e5618fbb5 | |
| parent | c42d0a041890b39fc98afd357ec1307a3a36208d (diff) | |
| download | angular.js-579242346c4202ea58fc2cae6df232289cbea0bb.tar.bz2 | |
fix(tests): Correct tests for IE11
Some tests were wrong. However, src/* did not contain problems.
Fixes #5046
| -rwxr-xr-x | test/ng/compileSpec.js | 4 | ||||
| -rw-r--r-- | test/ng/snifferSpec.js | 7 | ||||
| -rw-r--r-- | test/ngMock/angular-mocksSpec.js | 7 |
3 files changed, 9 insertions, 9 deletions
diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js index c25c5040..5b6e1ada 100755 --- a/test/ng/compileSpec.js +++ b/test/ng/compileSpec.js @@ -596,8 +596,8 @@ describe('$compile', function() { expect(element).toHaveClass('class_2'); })); - if (!msie || msie > 10) { - // style interpolation not working on IE<11. + if (!msie || msie > 11) { + // style interpolation not working on IE (including IE11). it('should handle interpolated css style from replacing directive', inject( function($compile, $rootScope) { element = $compile('<div replace-with-interpolated-style></div>')($rootScope); diff --git a/test/ng/snifferSpec.js b/test/ng/snifferSpec.js index 24e0584b..8b3d3ffd 100644 --- a/test/ng/snifferSpec.js +++ b/test/ng/snifferSpec.js @@ -334,8 +334,11 @@ describe('$sniffer', function() { }); }); - it('should return true for msie when internet explorer is being used', inject(function($sniffer) { - expect($sniffer.msie > 0).toBe(window.navigator.appName == 'Microsoft Internet Explorer'); + it('should return the internal msie flag', inject(function($sniffer) { + expect(isNaN($sniffer.msie)).toBe(isNaN(msie)); + if (msie) { + expect($sniffer.msie).toBe(msie); + } })); it('should return document.documentMode as msieDocumentMode', function() { diff --git a/test/ngMock/angular-mocksSpec.js b/test/ngMock/angular-mocksSpec.js index 80580fb1..15ebc758 100644 --- a/test/ngMock/angular-mocksSpec.js +++ b/test/ngMock/angular-mocksSpec.js @@ -1,11 +1,8 @@ 'use strict'; -var msie = +((/msie (\d+)/.exec(navigator.userAgent.toLowerCase()) || [])[1]); - describe('ngMock', function() { var noop = angular.noop; - describe('TzDate', function() { function minutes(min) { @@ -686,10 +683,10 @@ describe('ngMock', function() { expect(d($rootScope)).toMatch(/{"abc":"123"}/); })); - it('should serialize scope that has overridden "hasOwnProperty"', inject(function($rootScope){ + it('should serialize scope that has overridden "hasOwnProperty"', inject(function($rootScope, $sniffer){ // MS IE8 just doesn't work for this kind of thing, since "for ... in" doesn't return // things like hasOwnProperty even if it is explicitly defined on the actual object! - if (msie<=8) return; + if ($sniffer.msie<=8) return; $rootScope.hasOwnProperty = 'X'; expect(d($rootScope)).toMatch(/Scope\(.*\): \{/); expect(d($rootScope)).toMatch(/hasOwnProperty: "X"/); |
