capybara 2.10.2 → 2.11.0

data/spec/selenium_spec_marionette.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require "selenium-webdriver"
+require 'shared_selenium_session'
+require 'rspec/shared_spec_matchers'
+
+Capybara.register_driver :selenium_marionette do |app|
+  Capybara::Selenium::Driver.new(
+    app,
+    browser: :firefox,
+    desired_capabilities: Selenium::WebDriver::Remote::Capabilities.firefox(marionette: true)
+  )
+end
+
+Capybara.register_driver :selenium_marionette_clear_storage do |app|
+  Capybara::Selenium::Driver.new(
+    app,
+    browser: :firefox,
+    desired_capabilities: Selenium::WebDriver::Remote::Capabilities.firefox(marionette: true),
+    clear_local_storage: true,
+    clear_session_storage: true
+  )
+end
+
+module TestSessions
+  SeleniumMarionette = Capybara::Session.new(:selenium_marionette, TestApp)
+end
+
+skipped_tests = [
+  :response_headers,
+  :status_code,
+  :trigger
+]
+skipped_tests << :windows if ENV['TRAVIS'] && !ENV['WINDOW_TEST']
+
+Capybara::SpecHelper.run_specs TestSessions::SeleniumMarionette, "selenium", capybara_skip: skipped_tests
+
+RSpec.describe "Capybara::Session with firefox" do
+  include_examples  "Capybara::Session", TestSessions::SeleniumMarionette, :selenium_marionette
+  include_examples  Capybara::RSpecMatchers, TestSessions::SeleniumMarionette, :selenium_marionette
+end
+
+RSpec.describe Capybara::Selenium::Driver do
+  before do
+    @driver = Capybara::Selenium::Driver.new(TestApp, browser: :firefox)
+  end
+
+  describe '#quit' do
+    it "should reset browser when quit" do
+      expect(@driver.browser).to be
+      @driver.quit
+      #access instance variable directly so we don't create a new browser instance
+      expect(@driver.instance_variable_get(:@browser)).to be_nil
+    end
+
+    context "with errors" do
+      before do
+        @original_browser = @driver.browser
+      end
+      after do
+        # Ensure browser is actually quit so we don't leave hanging processe
+        RSpec::Mocks.space.proxy_for(@original_browser).reset
+        @original_browser.quit
+      end
+
+      it "warns UnknownError returned during quit because the browser is probably already gone" do
+        expect_any_instance_of(Capybara::Selenium::Driver).to receive(:warn).with(/random message/)
+        allow(@driver.browser).to(
+          receive(:quit)
+          .and_raise(Selenium::WebDriver::Error::UnknownError, "random message")
+        )
+
+        expect { @driver.quit }.not_to raise_error
+        expect(@driver.instance_variable_get(:@browser)).to be_nil
+      end
+
+      it "ignores silenced UnknownError returned during quit because the browser is almost definitely already gone" do
+        expect_any_instance_of(Capybara::Selenium::Driver).not_to receive(:warn)
+        allow(@driver.browser).to(
+          receive(:quit)
+          .and_raise(Selenium::WebDriver::Error::UnknownError, "Error communicating with the remote browser")
+        )
+
+        expect { @driver.quit }.not_to raise_error
+        expect(@driver.instance_variable_get(:@browser)).to be_nil
+      end
+    end
+  end
+
+  context "storage" do
+    describe "#reset!" do
+      it "does not clear either storage by default" do
+        @session = TestSessions::SeleniumMarionette
+        @session.visit('/with_js')
+        @session.find(:css, '#set-storage').click
+        @session.reset!
+        @session.visit('/with_js')
+        expect(@session.driver.browser.local_storage.keys).not_to be_empty
+        expect(@session.driver.browser.session_storage.keys).not_to be_empty
+      end
+
+      it "clears storage when set" do
+        @session = Capybara::Session.new(:selenium_marionette_clear_storage, TestApp)
+        @session.visit('/with_js')
+        @session.find(:css, '#set-storage').click
+        @session.reset!
+        @session.visit('/with_js')
+        expect(@session.driver.browser.local_storage.keys).to be_empty
+        expect(@session.driver.browser.session_storage.keys).to be_empty
+      end
+    end
+  end
+end
+

data/spec/shared_selenium_session.rb

@@ -41,14 +41,16 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
       end
 
       it "should have return code 1 when running selenium_driver_rspec_failure.rb" do
-        ENV['SELENIUM_BROWSER'] = @session.driver.options[:browser].to_s
-        `rspec spec/fixtures/selenium_driver_rspec_failure.rb`
+        env = { 'SELENIUM_BROWSER' => @session.driver.options[:browser].to_s,
+                'LEGACY_FIREFOX' => (mode == :selenium_firefox ? 'TRUE' : nil) }
+        system(env, 'rspec spec/fixtures/selenium_driver_rspec_failure.rb', out: File::NULL, err: File::NULL)
         expect($?.exitstatus).to eq(1)
       end
 
       it "should have return code 0 when running selenium_driver_rspec_success.rb" do
-        ENV['SELENIUM_BROWSER'] = @session.driver.options[:browser].to_s
-        `rspec spec/fixtures/selenium_driver_rspec_success.rb`
+        env = { 'SELENIUM_BROWSER' => @session.driver.options[:browser].to_s,
+                'LEGACY_FIREFOX' => (mode == :selenium_firefox ? 'TRUE' : nil) }
+        system(env, 'rspec spec/fixtures/selenium_driver_rspec_success.rb', out: File::NULL, err: File::NULL)
         expect($?.exitstatus).to eq(0)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.10.2
+  version: 2.11.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -100,16 +100,22 @@ dependencies:
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -412,13 +418,14 @@ files:
 - spec/rack_test_spec.rb
 - spec/result_spec.rb
 - spec/rspec/features_spec.rb
-- spec/rspec/matchers_spec.rb
 - spec/rspec/scenarios_spec.rb
+- spec/rspec/shared_spec_matchers.rb
 - spec/rspec/views_spec.rb
 - spec/rspec_spec.rb
 - spec/selector_spec.rb
-- spec/selenium_firefox_spec.rb
 - spec/selenium_spec_chrome.rb
+- spec/selenium_spec_firefox.rb
+- spec/selenium_spec_marionette.rb
 - spec/server_spec.rb
 - spec/shared_selenium_session.rb
 - spec/spec_helper.rb

data/spec/selenium_firefox_spec.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-require 'spec_helper'
-require "selenium-webdriver"
-require 'shared_selenium_session'
-
-Capybara.register_driver :selenium_focus do |app|
-  # profile = Selenium::WebDriver::Firefox::Profile.new
-  # profile["focusmanager.testmode"] = true
-  # Capybara::Selenium::Driver.new(app, browser: :firefox, profile: profile)
-  Capybara::Selenium::Driver.new(app, browser: :firefox)
-end
-
-module TestSessions
-  Selenium = Capybara::Session.new(:selenium_focus, TestApp)
-end
-
-skipped_tests = [
-  :response_headers,
-  :status_code,
-  :trigger
-]
-skipped_tests << :windows if ENV['TRAVIS'] && !ENV['WINDOW_TEST']
-
-Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", capybara_skip: skipped_tests
-
-RSpec.describe "Capybara::Session with firefox" do
-  include_examples  "Capybara::Session", TestSessions::Selenium, :selenium_focus
-end
-
-RSpec.describe Capybara::Selenium::Driver do
-  before do
-    @driver = Capybara::Selenium::Driver.new(TestApp, browser: :firefox)
-  end
-
-  describe '#quit' do
-    it "should reset browser when quit" do
-      expect(@driver.browser).to be
-      @driver.quit
-      #access instance variable directly so we don't create a new browser instance
-      expect(@driver.instance_variable_get(:@browser)).to be_nil
-    end
-  end
-end
-