selenium-emulated_features 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88fa8eee73799af9ca8ddf6c97f41157640a17ff
-  data.tar.gz: f7e0a077e7a42db82e19d71f26b4089d5131e062
+  metadata.gz: ef19fa900178d7666dc5d52df3ecc90186a8f10b
+  data.tar.gz: 8714840b86268008cbb4bb72be7ccdcb72489c03
 SHA512:
-  metadata.gz: bdc0506bea01be5709183e9e0d9cd7e0e204875160e1bef3b13b8c0c56cd41726f3dbb8a08e66b76bc69fed0f9bdbcfb538d07032519d8c4400ae8d786bbbc33
-  data.tar.gz: cb98128b311e630a984f9b506d0adc72c70be085a60f62a7787bffa773bffe3a6470d32ee8764d6301b4ed63086f0cf8db7a732677cc0a74bb7a3924e1f4f7f8
+  metadata.gz: 99d0b8b457066eac833610b54d066cd94b6016904e77800faab76e1222647a0e72bd26530fbcfa8bb03849e18f1d72c1bc08669d4018d5a26809d52aba513d49
+  data.tar.gz: dc5eb77e6b255e5322ba16d7fa622b4fb34761cd996cb72eb04bf99d662b408bd597ea7759a5077efc0761b128148154ab2f8d8405003dbd11b8d3e48bc0f62b

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    selenium-emulated_features (2.0.0)
+    selenium-emulated_features (3.0.0)
       selenium-webdriver (~> 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    childprocess (0.5.9)
+    childprocess (0.7.0)
       ffi (~> 1.0, >= 1.0.11)
     diff-lcs (1.2.5)
-    ffi (1.9.14)
+    ffi (1.9.18)
     rack (1.6.0)
     rack-protection (1.5.3)
       rack
@@ -27,17 +27,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.1)
-    rubyzip (1.2.0)
-    selenium-webdriver (3.0.3)
+    rubyzip (1.2.1)
+    selenium-webdriver (3.4.3)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
-      websocket (~> 1.0)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
     tilt (1.4.1)
-    websocket (1.2.3)
 
 PLATFORMS
   ruby
@@ -48,4 +46,4 @@ DEPENDENCIES
   sinatra (~> 1.4)
 
 BUNDLED WITH
-   1.12.5
+   1.14.6

data/README.md

@@ -1,11 +1,22 @@
 # selenium-emulated_features
 Adds HTTP status code and response headers emulation to Selenium drivers.
 
+Latest release tested on OS X 10.12.3 with:
+
+| Browser             | Driver                   |
+| ------------------- |:------------------------:|
+| Chrome 60.0.3112.40 | ChromeDriver 2.30.477690 |
+| Safari 10.0.3       | built-in safaridriver    |
+| Firefox 54.0        | --                       |
+| PhantomJS 2.2.1     | --                       |
+
+__Note:__ Ensure _Develop > Allow Remote Automation_ is enabled in Safari!
+
 ## Installation
 Install with Bundler by adding the following line to your `Gemfile`:
 
 ```
-gem "selenium-emulated_features", "~> 2.0"
+gem "selenium-emulated_features", "~> 3.0"
 ```
 Or install via RubyGems:
 
@@ -25,19 +36,4 @@ driver.response_code    # => 404
 driver.response_headers # => {...}
 ```
 
-`nil` is returned if the URI is not reachable or an error occurs:
-
-```ruby
-driver.navigate.to("https://example.foobar")
-
-driver.response_code    # => nil
-driver.response_headers # => nil
-```
-
-If you want an exception to be raised instead:
-
-```ruby
-Selenium::EmulatedFeatures.raise_exceptions = true
-driver.navigate.to("https://example.foobar")
-driver.response_code # => Selenium::EmulatedFeatures::Error
-```
+`nil` is returned if the URI is not reachable or an error occurs.

data/lib/selenium/emulated_features.rb

@@ -5,13 +5,7 @@ require "emulated_features/response_headers"
 
 module Selenium
   module EmulatedFeatures
-    VERSION = "2.0.1"
-
-    class Error < StandardError; end
-
-    class << self
-      attr_accessor :raise_exceptions
-    end
+    VERSION = "3.0.0"
   end
 end
 

data/lib/selenium/emulated_features/response_code.rb

@@ -2,52 +2,33 @@ module Selenium
   module EmulatedFeatures
     module ResponseCode
       def response_code
-        dom_str = execute_script <<-js
-          if(document.SEF && document.SEF.request) {
-            return document.SEF.request.status;
+        execute_script <<-js
+          if(document.__SEF__ && document.__SEF__.request) {
+            return document.__SEF__.request.status;
           }
 
           var baseURI = document.baseURI;
 
           /* Firefox */
-          if(/about:neterror/.test(baseURI)) {
-            return null;
-          }
+          if (/about:neterror/.test(baseURI)) return null;
 
           /* Safari */
-          if(/Safari.app/.test(baseURI)) {
-            return null;
-          }
+          if (/Safari.app/.test(baseURI)) return null;
 
           /* Chrome */
-          if(/chromewebdata/.test(baseURI)) {
-            return null;
-          }
+          if (/chromewebdata/.test(baseURI)) return null;
 
-          document.SEF = {}
-          document.SEF.request = new XMLHttpRequest();
+          document.__SEF__ = {}
+          document.__SEF__.request = new XMLHttpRequest();
 
-          document.SEF.request.open("GET", document.location, false);
-          document.SEF.request.send(null);
-          return document.SEF.request.status;
+          document.__SEF__.request.open("GET", document.location, false);
+          document.__SEF__.request.send(null);
+          return document.__SEF__.request.status;
         js
-
-        return dom_str if dom_str
-
-        if Selenium::EmulatedFeatures.raise_exceptions
-          raise Selenium::EmulatedFeatures::Error
-        else
-          nil
-        end
-
-      # PhantomJS
-      rescue Selenium::WebDriver::Error::UnknownError
-        if Selenium::EmulatedFeatures.raise_exceptions
-          raise Selenium::EmulatedFeatures::Error
-        else
-          nil
-        end
       end
+
+    rescue
+      nil
     end
   end
 end

data/lib/selenium/emulated_features/response_headers.rb

@@ -3,57 +3,39 @@ module Selenium
     module ResponseHeaders
       def response_headers
         dom_str = execute_script <<-js
-          if(document.SEF && document.SEF.request) {
-            return document.SEF.request.getAllResponseHeaders();
+          if(document.__SEF__ && document.__SEF__.request) {
+            return document.__SEF__.request.getAllResponseHeaders();
           }
 
           var baseURI = document.baseURI;
 
           /* Firefox */
-          if(/about:neterror/.test(baseURI)) {
-            return null;
-          }
+          if (/about:neterror/.test(baseURI)) return null;
 
           /* Safari */
-          if(/Safari.app/.test(baseURI)) {
-            return null;
-          }
+          if (/Safari.app/.test(baseURI)) return null;
 
           /* Chrome */
-          if(/chromewebdata/.test(baseURI)) {
-            return null;
-          }
+          if (/chromewebdata/.test(baseURI)) return null;
 
-          document.SEF = {};
-          document.SEF.request = new XMLHttpRequest();
+          document.__SEF__ = {};
+          document.__SEF__.request = new XMLHttpRequest();
 
-          document.SEF.request.open("GET", document.location, false);
-          document.SEF.request.send(null);
-          return document.SEF.request.getAllResponseHeaders();
+          document.__SEF__.request.open("GET", document.location, false);
+          document.__SEF__.request.send(null);
+          return document.__SEF__.request.getAllResponseHeaders();
         js
 
-        if !dom_str
-          if Selenium::EmulatedFeatures.raise_exceptions
-            raise Selenium::EmulatedFeatures::Error
-          else
-            return nil
-          end
-        end
+        return nil unless dom_str
 
         dom_str.split("\n").inject({}) do |headers, line|
           field, value = line.split(": ")
           headers.merge({ field.downcase => [value.strip] })
         end
 
-        # PhantomJS, Firefox
-        rescue Selenium::WebDriver::Error::UnknownError,
-               Selenium::WebDriver::Error::JavascriptError
-          if Selenium::EmulatedFeatures.raise_exceptions
-            raise Selenium::EmulatedFeatures::Error
-          else
-            nil
-          end
-        end
+      rescue
+        nil
+      end
     end
   end
 end

data/selenium-emulated_features.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "selenium-emulated_features"
-  s.version     = "2.0.1"
+  s.version     = "3.0.0"
 
   s.summary = <<-summary
     Adds HTTP status code and response headers emulation to Selenium drivers

data/spec/response_code_spec.rb

@@ -2,7 +2,6 @@ require "selenium-webdriver"
 require "selenium/emulated_features"
 
 describe Selenium::EmulatedFeatures::ResponseCode do
-
   shared_examples "a WebDriver that responds to #response_code" do
     after { driver.quit }
 
@@ -18,35 +17,6 @@ describe Selenium::EmulatedFeatures::ResponseCode do
       driver.navigate.to "http://0.0.0.0:9876/status_code/418"
       expect(driver.response_code).to be 418
     end
-
-    context "when server is unreachable" do
-      before { skip if driver.browser == :safari }
-
-      it "returns nil" do
-        driver.navigate.to "http://example.foobar"
-        expect(driver.response_code).to be nil
-      end
-
-      it "still works for successive requests" do
-        driver.navigate.to "http://example.foobar"
-        expect(driver.response_code).to be nil
-
-        driver.navigate.to "http://0.0.0.0:9876/status_code/418"
-        expect(driver.response_code).to be 418
-      end
-
-      context "with exceptions enabled" do
-        before { Selenium::EmulatedFeatures.raise_exceptions = true }
-        after  { Selenium::EmulatedFeatures.raise_exceptions = false }
-
-        it "raises an exception" do
-          expect {
-            driver.navigate.to "http://example.foobar"
-            puts driver.response_code.class
-          }.to raise_error Selenium::EmulatedFeatures::Error
-        end
-      end
-    end
   end
 
   describe "Firefox driver", firefox: true do

data/spec/response_headers_spec.rb

@@ -2,7 +2,6 @@ require "selenium-webdriver"
 require "selenium/emulated_features"
 
 describe Selenium::EmulatedFeatures::ResponseHeaders do
-
   shared_examples "a WebDriver that responds to #response_headers" do
     after { driver.quit }
 
@@ -21,34 +20,6 @@ describe Selenium::EmulatedFeatures::ResponseHeaders do
 
       expect(headers_a).not_to eq headers_b
     end
-
-    context "when server is unreachable" do
-      before { skip if driver.browser == :safari }
-
-      it "returns nil" do
-        driver.navigate.to "http://example.foobar"
-        expect(driver.response_headers).to be nil
-      end
-
-      it "still works for successive requests" do
-        driver.navigate.to "http://example.foobar"
-        driver.navigate.to "http://0.0.0.0:9876/response_headers"
-        expect(driver.response_headers["foo"]).to eq ["Bar"]
-        expect(driver.response_headers["alpha"]).to eq ["Beta"]
-      end
-
-      context "with exceptions enabled" do
-        before { Selenium::EmulatedFeatures.raise_exceptions = true }
-        after  { Selenium::EmulatedFeatures.raise_exceptions = false }
-
-        it "raises an exception" do
-          expect {
-            driver.navigate.to "http://example.foobar"
-            driver.response_headers
-          }.to raise_error Selenium::EmulatedFeatures::Error
-        end
-      end
-    end
   end
 
   describe "Firefox driver", firefox: true do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selenium-emulated_features
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Dominic Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-11 00:00:00.000000000 Z
+date: 2017-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -99,4 +99,3 @@ summary: Adds HTTP status code and response headers emulation to Selenium driver
 test_files:
 - spec/response_code_spec.rb
 - spec/response_headers_spec.rb
-has_rdoc: