diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/AngularSpec.js | 15 | ||||
| -rwxr-xr-x | test/ng/compileSpec.js | 6 | ||||
| -rw-r--r-- | test/ng/snifferSpec.js | 2 |
3 files changed, 19 insertions, 4 deletions
diff --git a/test/AngularSpec.js b/test/AngularSpec.js index 344e2ead..f6796496 100644 --- a/test/AngularSpec.js +++ b/test/AngularSpec.js @@ -1003,4 +1003,19 @@ describe('angular', function() { }); }); + describe('msie UA parsing', function() { + if (/ Trident\/.*; rv:/.test(window.navigator.userAgent)) { + it('should fail when the Trident and the rv versions disagree for IE11+', function() { + // When this test fails, we can think about whether we want to use the version from the + // Trident token in the UA string or stick with the version from rv: as we currently do. + // Refer https://github.com/angular/angular.js/pull/3758#issuecomment-23529245 for the + // discussion. + var UA = window.navigator.userAgent; + var tridentVersion = parseInt((/Trident\/(\d+)/.exec(UA) || [])[1], 10) + 4; + var rvVersion = parseInt((/Trident\/.*; rv:(\d+)/.exec(UA) || [])[1], 10); + expect(tridentVersion).toBe(rvVersion); + }); + } + }); + }); diff --git a/test/ng/compileSpec.js b/test/ng/compileSpec.js index 13604f6f..d2643878 100755 --- a/test/ng/compileSpec.js +++ b/test/ng/compileSpec.js @@ -2897,7 +2897,7 @@ describe('$compile', function() { })); - // Fails on IE < 10 with "TypeError: Access is denied" when trying to set img[src] + // Fails on IE <= 10 with "TypeError: Access is denied" when trying to set img[src] if (!msie || msie > 10) { it('should sanitize mailto: urls', inject(function($compile, $rootScope) { element = $compile('<img src="{{testUrl}}"></a>')($rootScope); @@ -3008,9 +3008,9 @@ describe('$compile', function() { inject(function($compile, $rootScope) { element = $compile('<img src="{{testUrl}}"></img>')($rootScope); - // Fails on IE < 10 with "TypeError: Object doesn't support this property or method" when + // Fails on IE <= 11 with "TypeError: Object doesn't support this property or method" when // trying to set img[src] - if (!msie || msie > 10) { + if (!msie || msie > 11) { $rootScope.testUrl = "javascript:doEvilStuff()"; $rootScope.$apply(); expect(element.attr('src')).toBe('javascript:doEvilStuff()'); diff --git a/test/ng/snifferSpec.js b/test/ng/snifferSpec.js index 1bf29f73..6edf9f61 100644 --- a/test/ng/snifferSpec.js +++ b/test/ng/snifferSpec.js @@ -112,7 +112,7 @@ describe('$sniffer', function() { else if(/firefox/i.test(ua)) { expectedPrefix = 'Moz'; } - else if(/ie/i.test(ua)) { + else if(/ie/i.test(ua) || /trident/i.test(ua)) { expectedPrefix = 'Ms'; } else if(/opera/i.test(ua)) { |