From f2306729cd97fd9edf8d0367920c1006919dd50b Mon Sep 17 00:00:00 2001 From: Colin O'Byrne and JR Boyens Date: Mon, 22 Jul 2013 14:22:14 -0700 Subject: [PATCH] Improve isIE check to allow us to check for a minimum version --- spec/core/ExceptionFormatterSpec.js | 4 ++-- spec/core/matchers/matchersUtilSpec.js | 2 +- spec/helpers/BrowserFlags.js | 14 ++++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/spec/core/ExceptionFormatterSpec.js b/spec/core/ExceptionFormatterSpec.js index 203be25c..7e3d5835 100644 --- a/spec/core/ExceptionFormatterSpec.js +++ b/spec/core/ExceptionFormatterSpec.js @@ -40,8 +40,8 @@ describe("ExceptionFormatter", function() { }); describe("#stack", function() { - it("formats stack traces from Webkit, Firefox or node.js", function() { - if (isIE()) { return; } + it("formats stack traces from Webkit, Firefox, node.js or IE10+", function() { + if (jasmine.getGlobal().ieVersion < 10) { return; } var error; try { throw new Error("an error") } catch(e) { error = e; } diff --git a/spec/core/matchers/matchersUtilSpec.js b/spec/core/matchers/matchersUtilSpec.js index 82f070ef..3ab01e47 100644 --- a/spec/core/matchers/matchersUtilSpec.js +++ b/spec/core/matchers/matchersUtilSpec.js @@ -111,7 +111,7 @@ describe("matchersUtil", 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 }, b = {foo: 1 }; diff --git a/spec/helpers/BrowserFlags.js b/spec/helpers/BrowserFlags.js index 9f9fb17a..afa13b7c 100644 --- a/spec/helpers/BrowserFlags.js +++ b/spec/helpers/BrowserFlags.js @@ -1,8 +1,10 @@ -function isIE(version) { - var userAgent = jasmine.getGlobal().navigator.userAgent; - if (!userAgent) { return; } +(function(global) { + global.ieVersion = (function() { + 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; -} \ No newline at end of file + return match ? parseFloat(match[1]) : Number.MAX_VALUE; + })(); +})(jasmine.getGlobal()); \ No newline at end of file