mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-05-09 15:24:43 +00:00
fix(tests): Correct tests for IE11
Some tests were wrong. However, src/* did not contain problems. Fixes #5046
This commit is contained in:
parent
c42d0a0418
commit
579242346c
3 changed files with 9 additions and 9 deletions
|
|
@ -596,8 +596,8 @@ describe('$compile', function() {
|
||||||
expect(element).toHaveClass('class_2');
|
expect(element).toHaveClass('class_2');
|
||||||
}));
|
}));
|
||||||
|
|
||||||
if (!msie || msie > 10) {
|
if (!msie || msie > 11) {
|
||||||
// style interpolation not working on IE<11.
|
// style interpolation not working on IE (including IE11).
|
||||||
it('should handle interpolated css style from replacing directive', inject(
|
it('should handle interpolated css style from replacing directive', inject(
|
||||||
function($compile, $rootScope) {
|
function($compile, $rootScope) {
|
||||||
element = $compile('<div replace-with-interpolated-style></div>')($rootScope);
|
element = $compile('<div replace-with-interpolated-style></div>')($rootScope);
|
||||||
|
|
|
||||||
|
|
@ -334,8 +334,11 @@ describe('$sniffer', function() {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should return true for msie when internet explorer is being used', inject(function($sniffer) {
|
it('should return the internal msie flag', inject(function($sniffer) {
|
||||||
expect($sniffer.msie > 0).toBe(window.navigator.appName == 'Microsoft Internet Explorer');
|
expect(isNaN($sniffer.msie)).toBe(isNaN(msie));
|
||||||
|
if (msie) {
|
||||||
|
expect($sniffer.msie).toBe(msie);
|
||||||
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
it('should return document.documentMode as msieDocumentMode', function() {
|
it('should return document.documentMode as msieDocumentMode', function() {
|
||||||
|
|
|
||||||
7
test/ngMock/angular-mocksSpec.js
vendored
7
test/ngMock/angular-mocksSpec.js
vendored
|
|
@ -1,11 +1,8 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var msie = +((/msie (\d+)/.exec(navigator.userAgent.toLowerCase()) || [])[1]);
|
|
||||||
|
|
||||||
describe('ngMock', function() {
|
describe('ngMock', function() {
|
||||||
var noop = angular.noop;
|
var noop = angular.noop;
|
||||||
|
|
||||||
|
|
||||||
describe('TzDate', function() {
|
describe('TzDate', function() {
|
||||||
|
|
||||||
function minutes(min) {
|
function minutes(min) {
|
||||||
|
|
@ -686,10 +683,10 @@ describe('ngMock', function() {
|
||||||
expect(d($rootScope)).toMatch(/{"abc":"123"}/);
|
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
|
// 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!
|
// 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';
|
$rootScope.hasOwnProperty = 'X';
|
||||||
expect(d($rootScope)).toMatch(/Scope\(.*\): \{/);
|
expect(d($rootScope)).toMatch(/Scope\(.*\): \{/);
|
||||||
expect(d($rootScope)).toMatch(/hasOwnProperty: "X"/);
|
expect(d($rootScope)).toMatch(/hasOwnProperty: "X"/);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue