admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve isIE check to allow us to check for a minimum version

Browse Source
This commit is contained in:
Colin O'Byrne and JR Boyens
2013-07-22 14:22:14 -07:00
parent 2165d71dc5
commit f2306729cd
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/core/ExceptionFormatterSpec.js
View File

@@ -40,8 +40,8 @@ describe("ExceptionFormatter", function() {
}); });
describe("#stack", function() { describe("#stack", function() {
it("formats stack traces from Webkit, Firefox or node.js", function() { it("formats stack traces from Webkit, Firefox, node.js or IE10+", function() {
if (isIE()) { return; } if (jasmine.getGlobal().ieVersion < 10) { return; }
var error; var error;
try { throw new Error("an error") } catch(e) { error = e; } try { throw new Error("an error") } catch(e) { error = e; }

2
spec/core/matchers/matchersUtilSpec.js
View File

@@ -111,7 +111,7 @@ describe("matchersUtil", function() {
}); });
it("passes for equivalent frozen objects (GitHub issue #266)", function() { it("passes for equivalent frozen objects (GitHub issue #266)", function() {
if (isIE(8)) { return; } if (jasmine.getGlobal().ieVersion < 9) { return; }
var a = { foo: 1 }, var a = { foo: 1 },
b = {foo: 1 }; b = {foo: 1 };

14
spec/helpers/BrowserFlags.js
View File

@@ -1,8 +1,10 @@
function isIE(version) { (function(global) {
var userAgent = jasmine.getGlobal().navigator.userAgent; global.ieVersion = (function() {
if (!userAgent) { return; } var userAgent = jasmine.getGlobal().navigator.userAgent;
if (!userAgent) { return Number.MAX_VALUE; }
var match = /MSIE ([0-9]{1,}[\.0-9]{0,})/.exec(userAgent); var match = /MSIE ([0-9]{1,}[\.0-9]{0,})/.exec(userAgent);
return match && version ? parseFloat(match[1]) === version : match; return match ? parseFloat(match[1]) : Number.MAX_VALUE;
} })();
})(jasmine.getGlobal());