From a42f28c7346618c216d92dde82c66e67ad5d9f36 Mon Sep 17 00:00:00 2001 From: Steve Gravrock Date: Thu, 9 Nov 2017 07:04:06 -0800 Subject: [PATCH] Removed checks for PhantomJS 1 v2 has been out for a long time, and v1 can no longer be easily installed. --- spec/core/matchers/toThrowErrorSpec.js | 2 +- spec/helpers/BrowserFlags.js | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/spec/core/matchers/toThrowErrorSpec.js b/spec/core/matchers/toThrowErrorSpec.js index eaa9c137..c88bbf57 100644 --- a/spec/core/matchers/toThrowErrorSpec.js +++ b/spec/core/matchers/toThrowErrorSpec.js @@ -79,7 +79,7 @@ describe("toThrowError", function() { }); it("passes if thrown is an instanceof Error regardless of global that contains its constructor", function() { - if (isNotRunningInBrowser() || jasmine.getEnv().phantomVersion < 2) { + if (isNotRunningInBrowser()) { return; } diff --git a/spec/helpers/BrowserFlags.js b/spec/helpers/BrowserFlags.js index db3689e4..9cf630e7 100644 --- a/spec/helpers/BrowserFlags.js +++ b/spec/helpers/BrowserFlags.js @@ -12,8 +12,4 @@ return /Firefox\/([0-9]{0,})/.exec(userAgent); }); - env.phantomVersion = browserVersion(function(userAgent) { - return /PhantomJS\/([0-9]{0,})/.exec(userAgent); - }); - })(jasmine.getEnv());