RubyGems - capybara - Versions diffs - 2.5.0 → 2.18.0 - Mend

capybara 2.5.0 → 2.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (205) hide show

checksums.yaml +5 -5
data/.yard/templates_custom/default/class/html/selectors.erb +38 -0
data/.yard/templates_custom/default/class/html/setup.rb +17 -0
data/.yard/yard_extensions.rb +78 -0
data/.yardopts +1 -0
data/History.md +413 -10
data/License.txt +1 -1
data/README.md +237 -130
data/lib/capybara/config.rb +132 -0
data/lib/capybara/cucumber.rb +3 -1
data/lib/capybara/driver/base.rb +27 -6
data/lib/capybara/driver/node.rb +14 -5
data/lib/capybara/dsl.rb +2 -3
data/lib/capybara/helpers.rb +13 -65
data/lib/capybara/minitest/spec.rb +177 -0
data/lib/capybara/minitest.rb +278 -0
data/lib/capybara/node/actions.rb +180 -24
data/lib/capybara/node/base.rb +17 -5
data/lib/capybara/node/document.rb +5 -0
data/lib/capybara/node/document_matchers.rb +15 -14
data/lib/capybara/node/element.rb +55 -7
data/lib/capybara/node/finders.rb +179 -67
data/lib/capybara/node/matchers.rb +301 -105
data/lib/capybara/node/simple.rb +15 -4
data/lib/capybara/queries/ancestor_query.rb +25 -0
data/lib/capybara/queries/base_query.rb +69 -3
data/lib/capybara/queries/current_path_query.rb +17 -8
data/lib/capybara/queries/match_query.rb +19 -0
data/lib/capybara/queries/selector_query.rb +251 -0
data/lib/capybara/queries/sibling_query.rb +25 -0
data/lib/capybara/queries/text_query.rb +67 -16
data/lib/capybara/queries/title_query.rb +4 -2
data/lib/capybara/query.rb +3 -131
data/lib/capybara/rack_test/browser.rb +14 -5
data/lib/capybara/rack_test/css_handlers.rb +1 -0
data/lib/capybara/rack_test/driver.rb +15 -8
data/lib/capybara/rack_test/form.rb +34 -12
data/lib/capybara/rack_test/node.rb +29 -12
data/lib/capybara/rails.rb +3 -3
data/lib/capybara/result.rb +104 -9
data/lib/capybara/rspec/compound.rb +95 -0
data/lib/capybara/rspec/features.rb +17 -6
data/lib/capybara/rspec/matcher_proxies.rb +45 -0
data/lib/capybara/rspec/matchers.rb +199 -80
data/lib/capybara/rspec.rb +4 -2
data/lib/capybara/selector/css.rb +30 -0
data/lib/capybara/selector/filter.rb +20 -0
data/lib/capybara/selector/filter_set.rb +74 -0
data/lib/capybara/selector/filters/base.rb +33 -0
data/lib/capybara/selector/filters/expression_filter.rb +40 -0
data/lib/capybara/selector/filters/node_filter.rb +27 -0
data/lib/capybara/selector/selector.rb +276 -0
data/lib/capybara/selector.rb +452 -157
data/lib/capybara/selenium/driver.rb +282 -81
data/lib/capybara/selenium/node.rb +144 -46
data/lib/capybara/server.rb +59 -16
data/lib/capybara/session/config.rb +114 -0
data/lib/capybara/session/matchers.rb +29 -19
data/lib/capybara/session.rb +378 -143
data/lib/capybara/spec/fixtures/no_extension +1 -0
data/lib/capybara/spec/public/jquery-ui.js +13 -791
data/lib/capybara/spec/public/jquery.js +4 -9045
data/lib/capybara/spec/public/test.js +45 -11
data/lib/capybara/spec/session/accept_alert_spec.rb +30 -7
data/lib/capybara/spec/session/accept_confirm_spec.rb +14 -2
data/lib/capybara/spec/session/accept_prompt_spec.rb +35 -6
data/lib/capybara/spec/session/all_spec.rb +45 -32
data/lib/capybara/spec/session/ancestor_spec.rb +85 -0
data/lib/capybara/spec/session/assert_all_of_selectors_spec.rb +110 -0
data/lib/capybara/spec/session/assert_current_path.rb +15 -2
data/lib/capybara/spec/session/assert_selector.rb +29 -28
data/lib/capybara/spec/session/assert_text.rb +59 -20
data/lib/capybara/spec/session/assert_title.rb +25 -11
data/lib/capybara/spec/session/attach_file_spec.rb +42 -4
data/lib/capybara/spec/session/body_spec.rb +1 -0
data/lib/capybara/spec/session/check_spec.rb +90 -14
data/lib/capybara/spec/session/choose_spec.rb +31 -5
data/lib/capybara/spec/session/click_button_spec.rb +20 -9
data/lib/capybara/spec/session/click_link_or_button_spec.rb +15 -9
data/lib/capybara/spec/session/click_link_spec.rb +39 -15
data/lib/capybara/spec/session/current_scope_spec.rb +2 -1
data/lib/capybara/spec/session/current_url_spec.rb +12 -3
data/lib/capybara/spec/session/dismiss_confirm_spec.rb +6 -5
data/lib/capybara/spec/session/dismiss_prompt_spec.rb +4 -3
data/lib/capybara/spec/session/element/assert_match_selector.rb +36 -0
data/lib/capybara/spec/session/element/match_css_spec.rb +23 -0
data/lib/capybara/spec/session/element/match_xpath_spec.rb +23 -0
data/lib/capybara/spec/session/element/matches_selector_spec.rb +106 -0
data/lib/capybara/spec/session/evaluate_async_script_spec.rb +22 -0
data/lib/capybara/spec/session/evaluate_script_spec.rb +23 -1
data/lib/capybara/spec/session/execute_script_spec.rb +22 -3
data/lib/capybara/spec/session/fill_in_spec.rb +50 -32
data/lib/capybara/spec/session/find_button_spec.rb +43 -2
data/lib/capybara/spec/session/find_by_id_spec.rb +3 -2
data/lib/capybara/spec/session/find_field_spec.rb +42 -6
data/lib/capybara/spec/session/find_link_spec.rb +22 -3
data/lib/capybara/spec/session/find_spec.rb +103 -57
data/lib/capybara/spec/session/first_spec.rb +34 -18
data/lib/capybara/spec/session/frame/switch_to_frame_spec.rb +103 -0
data/lib/capybara/spec/session/{within_frame_spec.rb → frame/within_frame_spec.rb} +44 -2
data/lib/capybara/spec/session/go_back_spec.rb +2 -1
data/lib/capybara/spec/session/go_forward_spec.rb +2 -1
data/lib/capybara/spec/session/has_all_selectors_spec.rb +69 -0
data/lib/capybara/spec/session/has_button_spec.rb +17 -8
data/lib/capybara/spec/session/has_css_spec.rb +85 -73
data/lib/capybara/spec/session/has_current_path_spec.rb +91 -7
data/lib/capybara/spec/session/has_field_spec.rb +93 -58
data/lib/capybara/spec/session/has_link_spec.rb +9 -8
data/lib/capybara/spec/session/has_none_selectors_spec.rb +76 -0
data/lib/capybara/spec/session/has_select_spec.rb +159 -59
data/lib/capybara/spec/session/has_selector_spec.rb +64 -28
data/lib/capybara/spec/session/has_table_spec.rb +1 -0
data/lib/capybara/spec/session/has_text_spec.rb +27 -12
data/lib/capybara/spec/session/has_title_spec.rb +22 -4
data/lib/capybara/spec/session/has_xpath_spec.rb +32 -29
data/lib/capybara/spec/session/headers.rb +2 -1
data/lib/capybara/spec/session/html_spec.rb +4 -3
data/lib/capybara/spec/session/node_spec.rb +198 -38
data/lib/capybara/spec/session/refresh_spec.rb +28 -0
data/lib/capybara/spec/session/reset_session_spec.rb +46 -5
data/lib/capybara/spec/session/response_code.rb +2 -1
data/lib/capybara/spec/session/save_and_open_page_spec.rb +1 -0
data/lib/capybara/spec/session/save_and_open_screenshot_spec.rb +6 -5
data/lib/capybara/spec/session/save_page_spec.rb +34 -2
data/lib/capybara/spec/session/save_screenshot_spec.rb +31 -1
data/lib/capybara/spec/session/screenshot_spec.rb +4 -2
data/lib/capybara/spec/session/select_spec.rb +34 -32
data/lib/capybara/spec/session/selectors_spec.rb +65 -0
data/lib/capybara/spec/session/sibling_spec.rb +52 -0
data/lib/capybara/spec/session/text_spec.rb +4 -4
data/lib/capybara/spec/session/title_spec.rb +2 -1
data/lib/capybara/spec/session/uncheck_spec.rb +42 -2
data/lib/capybara/spec/session/unselect_spec.rb +17 -16
data/lib/capybara/spec/session/visit_spec.rb +77 -2
data/lib/capybara/spec/session/window/become_closed_spec.rb +12 -11
data/lib/capybara/spec/session/window/current_window_spec.rb +1 -0
data/lib/capybara/spec/session/window/open_new_window_spec.rb +1 -0
data/lib/capybara/spec/session/window/switch_to_window_spec.rb +16 -11
data/lib/capybara/spec/session/window/window_opened_by_spec.rb +7 -4
data/lib/capybara/spec/session/window/window_spec.rb +36 -29
data/lib/capybara/spec/session/window/windows_spec.rb +1 -0
data/lib/capybara/spec/session/window/within_window_spec.rb +31 -7
data/lib/capybara/spec/session/within_spec.rb +14 -6
data/lib/capybara/spec/spec_helper.rb +37 -4
data/lib/capybara/spec/test_app.rb +15 -3
data/lib/capybara/spec/views/buttons.erb +1 -0
data/lib/capybara/spec/views/fieldsets.erb +2 -1
data/lib/capybara/spec/views/form.erb +169 -9
data/lib/capybara/spec/views/frame_child.erb +10 -2
data/lib/capybara/spec/views/frame_one.erb +2 -1
data/lib/capybara/spec/views/frame_parent.erb +3 -2
data/lib/capybara/spec/views/frame_two.erb +2 -1
data/lib/capybara/spec/views/header_links.erb +1 -0
data/lib/capybara/spec/views/host_links.erb +1 -0
data/lib/capybara/spec/views/initial_alert.erb +10 -0
data/lib/capybara/spec/views/path.erb +1 -0
data/lib/capybara/spec/views/popup_one.erb +1 -0
data/lib/capybara/spec/views/popup_two.erb +1 -0
data/lib/capybara/spec/views/postback.erb +2 -1
data/lib/capybara/spec/views/tables.erb +1 -0
data/lib/capybara/spec/views/with_base_tag.erb +1 -0
data/lib/capybara/spec/views/with_count.erb +2 -1
data/lib/capybara/spec/views/with_fixed_header_footer.erb +17 -0
data/lib/capybara/spec/views/with_hover.erb +7 -1
data/lib/capybara/spec/views/with_html.erb +40 -2
data/lib/capybara/spec/views/with_html_entities.erb +1 -0
data/lib/capybara/spec/views/with_js.erb +32 -1
data/lib/capybara/spec/views/with_scope.erb +1 -0
data/lib/capybara/spec/views/with_simple_html.erb +2 -1
data/lib/capybara/spec/views/with_slow_unload.erb +17 -0
data/lib/capybara/spec/views/with_title.erb +2 -1
data/lib/capybara/spec/views/with_unload_alert.erb +14 -0
data/lib/capybara/spec/views/with_windows.erb +7 -0
data/lib/capybara/spec/views/within_frames.erb +3 -2
data/lib/capybara/version.rb +2 -1
data/lib/capybara/window.rb +20 -3
data/lib/capybara.rb +189 -93
data/spec/basic_node_spec.rb +7 -6
data/spec/capybara_spec.rb +90 -4
data/spec/dsl_spec.rb +3 -1
data/spec/filter_set_spec.rb +28 -0
data/spec/fixtures/capybara.csv +1 -0
data/spec/fixtures/selenium_driver_rspec_failure.rb +5 -1
data/spec/fixtures/selenium_driver_rspec_success.rb +5 -1
data/spec/minitest_spec.rb +130 -0
data/spec/minitest_spec_spec.rb +135 -0
data/spec/per_session_config_spec.rb +67 -0
data/spec/rack_test_spec.rb +50 -7
data/spec/result_spec.rb +76 -0
data/spec/rspec/features_spec.rb +21 -8
data/spec/rspec/scenarios_spec.rb +21 -0
data/spec/rspec/{matchers_spec.rb → shared_spec_matchers.rb} +160 -54
data/spec/rspec/views_spec.rb +5 -0
data/spec/rspec_matchers_spec.rb +46 -0
data/spec/rspec_spec.rb +79 -1
data/spec/selector_spec.rb +199 -0
data/spec/selenium_spec_chrome.rb +54 -9
data/spec/selenium_spec_firefox.rb +68 -0
data/spec/selenium_spec_marionette.rb +127 -0
data/spec/server_spec.rb +102 -14
data/spec/session_spec.rb +54 -0
data/spec/shared_selenium_session.rb +215 -0
data/spec/spec_helper.rb +7 -0
metadata +140 -15
data/spec/selenium_spec.rb +0 -128

data/spec/rspec_spec.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 RSpec.describe 'capybara/rspec', :type => :feature do
@@ -6,6 +7,10 @@ RSpec.describe 'capybara/rspec', :type => :feature do
     expect(page.body).to include('Another World')
   end
+  it "should include RSpec matcher proxies" do
+    expect(self.class.ancestors).to include Capybara::RSpecMatcherProxies
+  end
   context "resetting session" do
     it "sets a cookie in one example..." do
       visit('/set_cookie')
@@ -28,13 +33,86 @@ RSpec.describe 'capybara/rspec', :type => :feature do
     end
   end
-  it "switches to the javascript driver when giving it as metadata", :js => true do
+  it "switches to the javascript driver when giving it as metadata", js: true do
     expect(Capybara.current_driver).to eq(Capybara.javascript_driver)
   end
   it "switches to the given driver when giving it as metadata", :driver => :culerity do
     expect(Capybara.current_driver).to eq(:culerity)
   end
+  context "#all" do
+    it "allows access to the Capybara finder" do
+      visit('/with_html')
+      expect(all(:css, 'h2.head').size).to eq(5)
+    end
+    it "allows access to the RSpec matcher" do
+      skip "RSpec < 3 doesn't have an `all` matcher" if rspec2?
+      visit('/with_html')
+      expect(["test1", "test2"]).to all(be_a(String))
+    end
+  end
+  context "#within" do
+    it "allows access to the Capybara scoper" do
+      visit('/with_html')
+      expect do
+        within(:css, "#does_not_exist") { click_link "Go to simple" }
+      end.to raise_error(Capybara::ElementNotFound)
+    end
+    it "allows access to the RSpec matcher" do
+      skip "RSpec version doesn't have a 'within' matcher" unless ::RSpec::Matchers.instance_methods.include?(:within)
+      visit('/with_html')
+      # This reads terribly, but must call #within
+      expect(find(:css, 'span.number').text.to_i).to within(1).of(41)
+    end
+  end
+end
+RSpec.describe 'capybara/rspec', :type => :other do
+  context "when RSpec::Matchers is included after Capybara::DSL" do
+    before do
+      class DSL_MatchersTest
+        include Capybara::DSL
+        include RSpec::Matchers
+      end
+      @test_class_instance = DSL_MatchersTest.new
+    end
+    context "#all" do
+      it "allows access to the Capybara finder" do
+        @test_class_instance.visit('/with_html')
+        expect(@test_class_instance.all(:css, 'h2.head').size).to eq(5)
+      end
+      it "allows access to the RSpec matcher" do
+        skip "RSpec < 3 doesn't have an `all` matcher" if rspec2?
+        @test_class_instance.visit('/with_html')
+        expect(["test1", "test2"]).to @test_class_instance.all(be_a(String))
+      end
+    end
+    context "#within" do
+      it "allows access to the Capybara scoper" do
+        @test_class_instance.visit('/with_html')
+        expect do
+          @test_class_instance.within(:css, "#does_not_exist") { @test_class_instance.click_link "Go to simple" }
+        end.to raise_error(Capybara::ElementNotFound)
+      end
+      it "allows access to the RSpec matcher" do
+        skip "RSpec version doesn't have a 'within' matcher" unless ::RSpec::Matchers.instance_methods.include?(:within)
+        @test_class_instance.visit('/with_html')
+        # This reads terribly, but must call #within
+        expect(@test_class_instance.find(:css, 'span.number').text.to_i).to @test_class_instance.within(1).of(41)
+      end
+    end
+  end
 end
 RSpec.describe 'capybara/rspec', :type => :other do

data/spec/selector_spec.rb ADDED Viewed

@@ -0,0 +1,199 @@
+# frozen_string_literal: true
+require 'spec_helper'
+RSpec.describe Capybara do
+  describe 'Selectors' do
+    let :string do
+      Capybara.string <<-STRING
+        <html>
+          <head>
+            <title>selectors</title>
+          </head>
+          <body>
+            <div class="a" id="page">
+              <div class="b" id="content">
+                <h1 class="a">Totally awesome</h1>
+                <p>Yes it is</p>
+              </div>
+              <p class="b">Some Content</p>
+              <p class="b"></p>
+            </div>
+            <div id="#special">
+            </div>
+            <input id="2checkbox" class="2checkbox" type="checkbox"/>
+            <input type="radio"/>
+            <label for="my_text_input">My Text Input</label>
+            <input type="text" name="form[my_text_input]" placeholder="my text" id="my_text_input"/>
+            <input type="file" id="file" class=".special file"/>
+            <input type="hidden" id="hidden_field" value="this is hidden"/>
+            <a href="#">link</a>
+            <fieldset></fieldset>
+            <select id="select">
+              <option value="a">A</option>
+              <option value="b" disabled>B</option>
+              <option value="c" selected>C</option>
+            </select>
+            <table>
+              <tr><td></td></tr>
+            </table
+          </body>
+        </html>
+      STRING
+    end
+    before do
+      Capybara.add_selector :custom_selector do
+        css { |css_class| "div.#{css_class}" }
+        filter(:not_empty, boolean: true, default: true, skip_if: :all) { |node, value| value ^ (node.text == '') }
+      end
+      Capybara.add_selector :custom_css_selector do
+        css { |selector| selector }
+      end
+    end
+    describe "adding a selector" do
+      it "can set default visiblity" do
+        Capybara.add_selector :hidden_field do
+          visible :hidden
+          css { |sel| 'input[type="hidden"]' }
+        end
+        expect(string).to have_no_css('input[type="hidden"]')
+        expect(string).to have_selector(:hidden_field)
+      end
+    end
+    describe "modify_selector" do
+      it "allows modifying a selector" do
+        el = string.find(:custom_selector, 'a')
+        expect(el.tag_name).to eq 'div'
+        Capybara.modify_selector :custom_selector do
+          css { |css_class| "h1.#{css_class}" }
+        end
+        el = string.find(:custom_selector, 'a')
+        expect(el.tag_name).to eq 'h1'
+      end
+      it "doesn't change existing filters" do
+        Capybara.modify_selector :custom_selector do
+          css { |css_class| "p.#{css_class}"}
+        end
+        expect(string).to have_selector(:custom_selector, 'b', count: 1)
+        expect(string).to have_selector(:custom_selector, 'b', not_empty: false, count: 1)
+        expect(string).to have_selector(:custom_selector, 'b', not_empty: :all, count: 2)
+      end
+    end
+    describe "builtin selectors" do
+      context "when locator is nil" do
+        it "devolves to just finding element types" do
+          selectors = {
+            field: ".//*[self::input | self::textarea | self::select][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]",
+            fieldset: ".//fieldset",
+            link: ".//a[./@href]",
+            link_or_button: ".//a[./@href] | .//input[./@type = 'submit' or ./@type = 'reset' or ./@type = 'image' or ./@type = 'button'] | .//button" ,
+            fillable_field: ".//*[self::input | self::textarea][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'radio' or ./@type = 'checkbox' or ./@type = 'hidden' or ./@type = 'file')]",
+            radio_button: ".//input[./@type = 'radio']",
+            checkbox: ".//input[./@type = 'checkbox']",
+            select: ".//select",
+            option: ".//option",
+            file_field: ".//input[./@type = 'file']",
+            table: ".//table"
+          }
+          selectors.each do |selector, xpath|
+            results = string.all(selector,nil).to_a.map(&:native)
+            expect(results.size).to be > 0
+            expect(results).to eq string.all(:xpath, xpath).to_a.map(&:native)
+          end
+        end
+      end
+      context "with :id option" do
+        it "works with compound css selectors" do
+          expect(string.all(:custom_css_selector, "div, h1", id: 'page').size).to eq 1
+          expect(string.all(:custom_css_selector, "h1, div", id: 'page').size).to eq 1
+        end
+        it "works with 'special' characters" do
+          skip "We support old Nokogiris but they have their limits" if Gem::Version.new(Nokogiri::VERSION) < Gem::Version.new('1.6.8')
+          expect(string.find(:custom_css_selector, "div", id: "#special")[:id]).to eq '#special'
+          expect(string.find(:custom_css_selector, "input", id: "2checkbox")[:id]).to eq '2checkbox'
+        end
+      end
+      context "with :class option" do
+        it "works with compound css selectors" do
+          expect(string.all(:custom_css_selector, "div, h1", class: 'a').size).to eq 2
+          expect(string.all(:custom_css_selector, "h1, div", class: 'a').size).to eq 2
+        end
+        it "works with 'special' characters" do
+          skip "We support old Nokogiris but they have their limits" if Gem::Version.new(Nokogiri::VERSION) < Gem::Version.new('1.6.8')
+          expect(string.find(:custom_css_selector, "input", class: ".special")[:id]).to eq 'file'
+          expect(string.find(:custom_css_selector, "input", class: "2checkbox")[:id]).to eq '2checkbox'
+        end
+      end
+      # :css, :xpath, :id, :field, :fieldset, :link, :button, :link_or_button, :fillable_field, :radio_button, :checkbox, :select,
+      # :option, :file_field, :label, :table, :frame
+      describe ":css selector" do
+        it "finds by CSS locator" do
+          expect(string.find(:css, "input#my_text_input")[:name]).to eq 'form[my_text_input]'
+        end
+      end
+      describe ":xpath selector" do
+        it "finds by XPath locator" do
+          expect(string.find(:xpath, './/input[@id="my_text_input"]')[:name]).to eq 'form[my_text_input]'
+        end
+      end
+      describe ":id selector" do
+        it "finds by locator" do
+          expect(string.find(:id, "my_text_input")[:name]).to eq 'form[my_text_input]'
+        end
+      end
+      describe ":field selector" do
+        it "finds by locator" do
+          expect(string.find(:field, 'My Text Input')[:id]).to eq 'my_text_input'
+          expect(string.find(:field, 'my_text_input')[:id]).to eq 'my_text_input'
+          expect(string.find(:field, 'form[my_text_input]')[:id]).to eq 'my_text_input'
+        end
+        it "finds by id" do
+          expect(string.find(:field, id: 'my_text_input')[:name]).to eq 'form[my_text_input]'
+        end
+        it "finds by name" do
+          expect(string.find(:field, name: 'form[my_text_input]')[:id]).to eq 'my_text_input'
+        end
+        it "finds by placeholder" do
+          expect(string.find(:field, placeholder: 'my text')[:id]).to eq 'my_text_input'
+        end
+        it "finds by type" do
+          expect(string.find(:field, type: 'file')[:id]).to eq 'file'
+          expect(string.find(:field, type: 'select')[:id]).to eq 'select'
+        end
+      end
+      describe ":option selector" do
+        it "finds disabled options" do
+          expect(string.find(:option, disabled: true).value).to eq 'b'
+        end
+        it "finds selected options" do
+          expect(string.find(:option, selected: true).value).to eq 'c'
+        end
+        it "finds not selected and not disabled options" do
+          expect(string.find(:option, disabled: false, selected: false).value).to eq 'a'
+        end
+      end
+    end
+  end
+end

data/spec/selenium_spec_chrome.rb CHANGED Viewed

@@ -1,17 +1,62 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'selenium-webdriver'
+require 'shared_selenium_session'
-Capybara.register_driver :selenium_chrome do |app|
-  args = ENV['TRAVIS'] ? ['no-sandbox' ] : []
-  Capybara::Selenium::Driver.new(app, :browser => :chrome, :args => args)
+CHROME_DRIVER = if ENV['HEADLESS'] then :selenium_chrome_headless else :selenium_chrome end
+# if ENV['HEADLESS'] && ENV['TRAVIS']
+#   Selenium::WebDriver::Chrome.path='/usr/bin/google-chrome-beta'
+# end
+Capybara.register_driver :selenium_chrome_clear_storage do |app|
+  chrome_options = {
+    browser: :chrome,
+    options: ::Selenium::WebDriver::Chrome::Options.new()
+  }
+  chrome_options[:options].args << 'headless' if ENV['HEADLESS']
+  Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: true, clear_session_storage: true))
 end
 module TestSessions
-  Chrome = Capybara::Session.new(:selenium_chrome, TestApp)
+  Chrome = Capybara::Session.new(CHROME_DRIVER, TestApp)
 end
-Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", :capybara_skip => [
-  :response_headers,
-  :status_code,
-  :trigger
-  ] unless ENV['TRAVIS'] && (RUBY_PLATFORM == 'java')
+skipped_tests = [:response_headers, :status_code, :trigger]
+# skip window tests when headless for now - closing a window not supported by chromedriver/chrome
+skipped_tests << :windows if ENV['TRAVIS']  && (ENV['SKIP_WINDOW'] || ENV['HEADLESS'])
+Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybara_skip: skipped_tests
+RSpec.describe "Capybara::Session with chrome" do
+  include Capybara::SpecHelper
+  include_examples  "Capybara::Session", TestSessions::Chrome, CHROME_DRIVER
+  context "storage" do
+    describe "#reset!" do
+      it "does not clear either storage by default" do
+        @session = TestSessions::Chrome
+        @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
+        expect(@session.evaluate_script('Object.keys(localStorage)')).not_to be_empty
+        expect(@session.evaluate_script('Object.keys(sessionStorage)')).not_to be_empty
+      end
+      it "clears storage when set" do
+        @session = Capybara::Session.new(:selenium_chrome_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
+        expect(@session.evaluate_script('Object.keys(localStorage)')).to be_empty
+        expect(@session.evaluate_script('Object.keys(sessionStorage)')).to be_empty
+      end
+    end
+  end
+end

data/spec/selenium_spec_firefox.rb ADDED Viewed

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require "selenium-webdriver"
+require 'shared_selenium_session'
+require 'rspec/shared_spec_matchers'
+Capybara.register_driver :selenium_firefox do |app|
+  Capybara::Selenium::Driver.new(
+    app,
+    browser: :firefox,
+    desired_capabilities: Selenium::WebDriver::Remote::Capabilities.firefox(marionette: false)
+  )
+end
+Capybara.register_driver :selenium_firefox_cant_clear_storage do |app|
+  Capybara::Selenium::Driver.new(
+    app,
+    browser: :firefox,
+    desired_capabilities: Selenium::WebDriver::Remote::Capabilities.firefox(marionette: false),
+    clear_local_storage: true,
+    clear_session_storage: true
+  )
+end
+module TestSessions
+  Selenium = Capybara::Session.new(:selenium_firefox, TestApp)
+end
+skipped_tests = [
+  :response_headers,
+  :status_code,
+  :trigger
+]
+skipped_tests << :windows if ENV['TRAVIS'] && ENV['SKIP_WINDOW']
+Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", capybara_skip: skipped_tests
+RSpec.describe "Capybara::Session with legacy firefox" do
+  include Capybara::SpecHelper
+  include_examples  "Capybara::Session", TestSessions::Selenium, :selenium_firefox
+  include_examples  Capybara::RSpecMatchers, TestSessions::Selenium, :selenium_firefox
+  context "storage" do
+    it "warns storage clearing isn't available" do
+      @session = Capybara::Session.new(:selenium_firefox_cant_clear_storage, TestApp)
+      expect_any_instance_of(Kernel).to receive(:warn).with('sessionStorage clear requested but is not available for this driver')
+      expect_any_instance_of(Kernel).to receive(:warn).with('localStorage clear requested but is not available for this driver')
+      @session.visit('/')
+      @session.reset!
+    end
+  end
+end
+RSpec.describe Capybara::Selenium::Driver do
+  before do
+    @driver = Capybara::Selenium::Driver.new(TestApp, browser: :firefox, desired_capabilities: Selenium::WebDriver::Remote::Capabilities.firefox(marionette: false))
+  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

data/spec/selenium_spec_marionette.rb ADDED Viewed

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require "selenium-webdriver"
+require 'shared_selenium_session'
+require 'rspec/shared_spec_matchers'
+browser_options = ::Selenium::WebDriver::Firefox::Options.new()
+browser_options.args << '--headless' if ENV['HEADLESS']
+browser_options.add_preference 'dom.file.createInChild', true
+# browser_options.add_option("log", {"level": "trace"})
+Capybara.register_driver :selenium_marionette do |app|
+  # ::Selenium::WebDriver.logger.level = "debug"
+  Capybara::Selenium::Driver.new(
+    app,
+    browser: :firefox,
+    desired_capabilities: {marionette: true, 'moz:webdriverClick': true},
+    options: browser_options
+    # Get a trace level log from geckodriver
+    # :driver_opts => { args: ['-vv'] }
+  )
+end
+Capybara.register_driver :selenium_marionette_clear_storage do |app|
+  Capybara::Selenium::Driver.new(
+    app,
+    browser: :firefox,
+    desired_capabilities: {marionette: true},
+    clear_local_storage: true,
+    clear_session_storage: true,
+    options: browser_options
+  )
+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['SKIP_WINDOW']
+Capybara::SpecHelper.run_specs TestSessions::SeleniumMarionette, "selenium", capybara_skip: skipped_tests
+RSpec.describe "Capybara::Session with firefox" do
+  include Capybara::SpecHelper
+  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, options: browser_options)
+  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