Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

fix(tests): Correct tests for IE11 #5075

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/ng/compileSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
7 changes: 5 additions & 2 deletions test/ng/snifferSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
7 changes: 2 additions & 5 deletions test/ngMock/angular-mocksSpec.js
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down Expand Up @@ -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"/);
Expand Down