RubyGems - capybara - Versions diffs - 3.8.1 → 3.33.0 - Mend

capybara 3.8.1 → 3.33.0

Files changed (242) hide show

checksums.yaml +4 -4
data/.yardopts +1 -0
data/History.md +465 -0
data/License.txt +1 -1
data/README.md +58 -57
data/lib/capybara/config.rb +10 -4
data/lib/capybara/cucumber.rb +1 -1
data/lib/capybara/driver/base.rb +2 -2
data/lib/capybara/driver/node.rb +26 -5
data/lib/capybara/dsl.rb +12 -4
data/lib/capybara/helpers.rb +8 -4
data/lib/capybara/minitest/spec.rb +162 -85
data/lib/capybara/minitest.rb +248 -148
data/lib/capybara/node/actions.rb +149 -96
data/lib/capybara/node/base.rb +27 -10
data/lib/capybara/node/document.rb +12 -0
data/lib/capybara/node/document_matchers.rb +9 -5
data/lib/capybara/node/element.rb +254 -109
data/lib/capybara/node/finders.rb +83 -76
data/lib/capybara/node/matchers.rb +279 -141
data/lib/capybara/node/simple.rb +25 -6
data/lib/capybara/queries/ancestor_query.rb +5 -7
data/lib/capybara/queries/base_query.rb +11 -5
data/lib/capybara/queries/current_path_query.rb +3 -3
data/lib/capybara/queries/match_query.rb +1 -0
data/lib/capybara/queries/selector_query.rb +467 -103
data/lib/capybara/queries/sibling_query.rb +5 -4
data/lib/capybara/queries/style_query.rb +6 -2
data/lib/capybara/queries/text_query.rb +17 -3
data/lib/capybara/queries/title_query.rb +2 -2
data/lib/capybara/rack_test/browser.rb +22 -15
data/lib/capybara/rack_test/driver.rb +10 -1
data/lib/capybara/rack_test/errors.rb +6 -0
data/lib/capybara/rack_test/form.rb +33 -28
data/lib/capybara/rack_test/node.rb +74 -6
data/lib/capybara/registration_container.rb +44 -0
data/lib/capybara/registrations/drivers.rb +36 -0
data/lib/capybara/registrations/patches/puma_ssl.rb +27 -0
data/lib/capybara/registrations/servers.rb +44 -0
data/lib/capybara/result.rb +55 -23
data/lib/capybara/rspec/features.rb +4 -4
data/lib/capybara/rspec/matcher_proxies.rb +36 -15
data/lib/capybara/rspec/matchers/base.rb +111 -0
data/lib/capybara/rspec/matchers/become_closed.rb +33 -0
data/lib/capybara/rspec/matchers/compound.rb +88 -0
data/lib/capybara/rspec/matchers/count_sugar.rb +37 -0
data/lib/capybara/rspec/matchers/have_ancestor.rb +28 -0
data/lib/capybara/rspec/matchers/have_current_path.rb +29 -0
data/lib/capybara/rspec/matchers/have_selector.rb +77 -0
data/lib/capybara/rspec/matchers/have_sibling.rb +27 -0
data/lib/capybara/rspec/matchers/have_text.rb +33 -0
data/lib/capybara/rspec/matchers/have_title.rb +29 -0
data/lib/capybara/rspec/matchers/match_selector.rb +27 -0
data/lib/capybara/rspec/matchers/match_style.rb +38 -0
data/lib/capybara/rspec/matchers/spatial_sugar.rb +39 -0
data/lib/capybara/rspec/matchers.rb +117 -311
data/lib/capybara/selector/builders/css_builder.rb +84 -0
data/lib/capybara/selector/builders/xpath_builder.rb +69 -0
data/lib/capybara/selector/css.rb +17 -15
data/lib/capybara/selector/definition/button.rb +52 -0
data/lib/capybara/selector/definition/checkbox.rb +26 -0
data/lib/capybara/selector/definition/css.rb +10 -0
data/lib/capybara/selector/definition/datalist_input.rb +35 -0
data/lib/capybara/selector/definition/datalist_option.rb +25 -0
data/lib/capybara/selector/definition/element.rb +27 -0
data/lib/capybara/selector/definition/field.rb +40 -0
data/lib/capybara/selector/definition/fieldset.rb +14 -0
data/lib/capybara/selector/definition/file_field.rb +13 -0
data/lib/capybara/selector/definition/fillable_field.rb +33 -0
data/lib/capybara/selector/definition/frame.rb +17 -0
data/lib/capybara/selector/definition/id.rb +6 -0
data/lib/capybara/selector/definition/label.rb +62 -0
data/lib/capybara/selector/definition/link.rb +54 -0
data/lib/capybara/selector/definition/link_or_button.rb +16 -0
data/lib/capybara/selector/definition/option.rb +27 -0
data/lib/capybara/selector/definition/radio_button.rb +27 -0
data/lib/capybara/selector/definition/select.rb +81 -0
data/lib/capybara/selector/definition/table.rb +109 -0
data/lib/capybara/selector/definition/table_row.rb +21 -0
data/lib/capybara/selector/definition/xpath.rb +5 -0
data/lib/capybara/selector/definition.rb +277 -0
data/lib/capybara/selector/filter.rb +1 -0
data/lib/capybara/selector/filter_set.rb +26 -19
data/lib/capybara/selector/filters/base.rb +24 -5
data/lib/capybara/selector/filters/expression_filter.rb +3 -3
data/lib/capybara/selector/filters/locator_filter.rb +29 -0
data/lib/capybara/selector/filters/node_filter.rb +16 -2
data/lib/capybara/selector/regexp_disassembler.rb +214 -0
data/lib/capybara/selector/selector.rb +73 -367
data/lib/capybara/selector/xpath_extensions.rb +17 -0
data/lib/capybara/selector.rb +221 -480
data/lib/capybara/selenium/atoms/getAttribute.min.js +1 -0
data/lib/capybara/selenium/atoms/isDisplayed.min.js +1 -0
data/lib/capybara/selenium/atoms/src/getAttribute.js +161 -0
data/lib/capybara/selenium/atoms/src/isDisplayed.js +454 -0
data/lib/capybara/selenium/driver.rb +203 -86
data/lib/capybara/selenium/driver_specializations/chrome_driver.rb +88 -14
data/lib/capybara/selenium/driver_specializations/edge_driver.rb +124 -0
data/lib/capybara/selenium/driver_specializations/firefox_driver.rb +89 -0
data/lib/capybara/selenium/driver_specializations/internet_explorer_driver.rb +26 -0
data/lib/capybara/selenium/driver_specializations/safari_driver.rb +24 -0
data/lib/capybara/selenium/extensions/file_input_click_emulation.rb +34 -0
data/lib/capybara/selenium/extensions/find.rb +110 -0
data/lib/capybara/selenium/extensions/html5_drag.rb +191 -22
data/lib/capybara/selenium/extensions/modifier_keys_stack.rb +28 -0
data/lib/capybara/selenium/extensions/scroll.rb +78 -0
data/lib/capybara/selenium/logger_suppressor.rb +34 -0
data/lib/capybara/selenium/node.rb +298 -93
data/lib/capybara/selenium/nodes/chrome_node.rb +100 -8
data/lib/capybara/selenium/nodes/edge_node.rb +104 -0
data/lib/capybara/selenium/nodes/firefox_node.rb +131 -0
data/lib/capybara/selenium/nodes/ie_node.rb +22 -0
data/lib/capybara/selenium/nodes/safari_node.rb +118 -0
data/lib/capybara/selenium/patches/action_pauser.rb +26 -0
data/lib/capybara/selenium/patches/atoms.rb +18 -0
data/lib/capybara/selenium/patches/is_displayed.rb +16 -0
data/lib/capybara/selenium/patches/logs.rb +45 -0
data/lib/capybara/selenium/patches/pause_duration_fix.rb +1 -3
data/lib/capybara/selenium/patches/persistent_client.rb +20 -0
data/lib/capybara/server/animation_disabler.rb +4 -3
data/lib/capybara/server/checker.rb +6 -2
data/lib/capybara/server/middleware.rb +23 -13
data/lib/capybara/server.rb +30 -7
data/lib/capybara/session/config.rb +14 -10
data/lib/capybara/session/matchers.rb +11 -7
data/lib/capybara/session.rb +152 -111
data/lib/capybara/spec/public/offset.js +6 -0
data/lib/capybara/spec/public/test.js +101 -10
data/lib/capybara/spec/session/all_spec.rb +96 -6
data/lib/capybara/spec/session/ancestor_spec.rb +5 -0
data/lib/capybara/spec/session/assert_all_of_selectors_spec.rb +29 -0
data/lib/capybara/spec/session/assert_current_path_spec.rb +5 -2
data/lib/capybara/spec/session/assert_selector_spec.rb +0 -10
data/lib/capybara/spec/session/assert_style_spec.rb +4 -4
data/lib/capybara/spec/session/assert_text_spec.rb +9 -5
data/lib/capybara/spec/session/attach_file_spec.rb +63 -36
data/lib/capybara/spec/session/check_spec.rb +10 -4
data/lib/capybara/spec/session/choose_spec.rb +8 -2
data/lib/capybara/spec/session/click_button_spec.rb +117 -61
data/lib/capybara/spec/session/click_link_or_button_spec.rb +16 -0
data/lib/capybara/spec/session/click_link_spec.rb +17 -6
data/lib/capybara/spec/session/element/matches_selector_spec.rb +40 -39
data/lib/capybara/spec/session/evaluate_script_spec.rb +13 -0
data/lib/capybara/spec/session/execute_script_spec.rb +1 -0
data/lib/capybara/spec/session/fill_in_spec.rb +47 -6
data/lib/capybara/spec/session/find_field_spec.rb +1 -1
data/lib/capybara/spec/session/find_spec.rb +74 -4
data/lib/capybara/spec/session/first_spec.rb +1 -1
data/lib/capybara/spec/session/frame/switch_to_frame_spec.rb +13 -1
data/lib/capybara/spec/session/frame/within_frame_spec.rb +12 -1
data/lib/capybara/spec/session/has_all_selectors_spec.rb +1 -1
data/lib/capybara/spec/session/has_ancestor_spec.rb +46 -0
data/lib/capybara/spec/session/has_any_selectors_spec.rb +25 -0
data/lib/capybara/spec/session/has_button_spec.rb +16 -0
data/lib/capybara/spec/session/has_css_spec.rb +122 -12
data/lib/capybara/spec/session/has_current_path_spec.rb +6 -4
data/lib/capybara/spec/session/has_field_spec.rb +55 -0
data/lib/capybara/spec/session/has_select_spec.rb +34 -6
data/lib/capybara/spec/session/has_selector_spec.rb +11 -4
data/lib/capybara/spec/session/has_sibling_spec.rb +50 -0
data/lib/capybara/spec/session/has_table_spec.rb +166 -0
data/lib/capybara/spec/session/has_text_spec.rb +48 -1
data/lib/capybara/spec/session/has_xpath_spec.rb +17 -0
data/lib/capybara/spec/session/html_spec.rb +7 -0
data/lib/capybara/spec/session/matches_style_spec.rb +35 -0
data/lib/capybara/spec/session/node_spec.rb +643 -18
data/lib/capybara/spec/session/node_wrapper_spec.rb +1 -1
data/lib/capybara/spec/session/refresh_spec.rb +4 -0
data/lib/capybara/spec/session/reset_session_spec.rb +23 -8
data/lib/capybara/spec/session/save_and_open_screenshot_spec.rb +2 -2
data/lib/capybara/spec/session/save_screenshot_spec.rb +4 -4
data/lib/capybara/spec/session/scroll_spec.rb +117 -0
data/lib/capybara/spec/session/select_spec.rb +10 -10
data/lib/capybara/spec/session/selectors_spec.rb +36 -5
data/lib/capybara/spec/session/uncheck_spec.rb +2 -2
data/lib/capybara/spec/session/unselect_spec.rb +1 -1
data/lib/capybara/spec/session/window/become_closed_spec.rb +20 -17
data/lib/capybara/spec/session/window/switch_to_window_spec.rb +4 -0
data/lib/capybara/spec/session/window/window_opened_by_spec.rb +4 -0
data/lib/capybara/spec/session/window/window_spec.rb +59 -58
data/lib/capybara/spec/session/window/windows_spec.rb +4 -0
data/lib/capybara/spec/session/within_spec.rb +23 -0
data/lib/capybara/spec/spec_helper.rb +16 -6
data/lib/capybara/spec/test_app.rb +28 -23
data/lib/capybara/spec/views/animated.erb +49 -0
data/lib/capybara/spec/views/form.erb +48 -7
data/lib/capybara/spec/views/frame_child.erb +3 -2
data/lib/capybara/spec/views/frame_one.erb +1 -0
data/lib/capybara/spec/views/obscured.erb +47 -0
data/lib/capybara/spec/views/offset.erb +32 -0
data/lib/capybara/spec/views/react.erb +45 -0
data/lib/capybara/spec/views/scroll.erb +20 -0
data/lib/capybara/spec/views/spatial.erb +31 -0
data/lib/capybara/spec/views/tables.erb +67 -0
data/lib/capybara/spec/views/with_animation.erb +29 -1
data/lib/capybara/spec/views/with_dragula.erb +24 -0
data/lib/capybara/spec/views/with_hover.erb +1 -0
data/lib/capybara/spec/views/with_hover1.erb +10 -0
data/lib/capybara/spec/views/with_html.erb +32 -6
data/lib/capybara/spec/views/with_js.erb +3 -1
data/lib/capybara/spec/views/with_jstree.erb +26 -0
data/lib/capybara/spec/views/with_scope_other.erb +6 -0
data/lib/capybara/spec/views/with_sortable_js.erb +21 -0
data/lib/capybara/version.rb +1 -1
data/lib/capybara/window.rb +11 -11
data/lib/capybara.rb +118 -111
data/spec/basic_node_spec.rb +14 -3
data/spec/capybara_spec.rb +29 -29
data/spec/css_builder_spec.rb +101 -0
data/spec/dsl_spec.rb +46 -21
data/spec/filter_set_spec.rb +5 -5
data/spec/fixtures/selenium_driver_rspec_failure.rb +1 -1
data/spec/fixtures/selenium_driver_rspec_success.rb +1 -1
data/spec/minitest_spec.rb +18 -4
data/spec/minitest_spec_spec.rb +59 -44
data/spec/rack_test_spec.rb +117 -89
data/spec/regexp_dissassembler_spec.rb +250 -0
data/spec/result_spec.rb +51 -49
data/spec/rspec/features_spec.rb +3 -0
data/spec/rspec/shared_spec_matchers.rb +112 -97
data/spec/rspec_spec.rb +35 -17
data/spec/sauce_spec_chrome.rb +43 -0
data/spec/selector_spec.rb +244 -28
data/spec/selenium_spec_chrome.rb +125 -54
data/spec/selenium_spec_chrome_remote.rb +26 -12
data/spec/selenium_spec_edge.rb +23 -8
data/spec/selenium_spec_firefox.rb +208 -0
data/spec/selenium_spec_firefox_remote.rb +15 -18
data/spec/selenium_spec_ie.rb +82 -13
data/spec/selenium_spec_safari.rb +148 -0
data/spec/server_spec.rb +118 -77
data/spec/session_spec.rb +19 -3
data/spec/shared_selenium_node.rb +83 -0
data/spec/shared_selenium_session.rb +110 -65
data/spec/spec_helper.rb +57 -9
data/spec/xpath_builder_spec.rb +93 -0
metadata +257 -17
data/lib/capybara/rspec/compound.rb +0 -94
data/lib/capybara/selenium/driver_specializations/marionette_driver.rb +0 -49
data/lib/capybara/selenium/nodes/marionette_node.rb +0 -121
data/lib/capybara/spec/session/has_style_spec.rb +0 -25
data/spec/selenium_spec_marionette.rb +0 -172

data/spec/selector_spec.rb CHANGED Viewed

@@ -5,19 +5,19 @@ require 'spec_helper'
 RSpec.describe Capybara do
   describe 'Selectors' do
     let :string do
-      Capybara.string <<-STRING
+      described_class.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>
+            <div class="aa" id="page">
+              <div class="bb" id="content">
+                <h1 class="aa">Totally awesome</h1>
                 <p>Yes it is</p>
               </div>
-              <p class="b c">Some Content</p>
-              <p class="b d"></p>
+              <p class="bb cc">Some Content</p>
+              <p class="bb dd !mine"></p>
             </div>
             <div id="#special">
             </div>
@@ -31,6 +31,7 @@ RSpec.describe Capybara do
             <input type="file" id="file" class=".special file"/>
             <input type="hidden" id="hidden_field" value="this is hidden"/>
             <input type="submit" value="click me" title="submit button"/>
+            <input type="button" value="don't click me" title="Other button 1" style="line-height: 30px;"/>
             <a href="#">link</a>
             <fieldset></fieldset>
             <select id="select">
@@ -41,29 +42,67 @@ RSpec.describe Capybara do
             <table>
               <tr><td></td></tr>
             </table>
+            <table id="rows">
+              <tr>
+                <td>A</td><td>B</td><td>C</td>
+              </tr>
+              <tr>
+                <td>D</td><td>E</td><td>F</td>
+              </tr>
+            </table>
+            <table id="cols">
+            <tbody>
+              <tr>
+                <td>A</td><td>D</td>
+              </tr>
+              <tr>
+                <td>B</td><td>E</td>
+              </tr>
+              <tr>
+                <td>C</td><td>F</td>
+              </tr>
+              </tbody>
+            </table>
           </body>
         </html>
       STRING
     end
     before do
-      Capybara.add_selector :custom_selector do
+      described_class.add_selector :custom_selector do
         css { |css_class| "div.#{css_class}" }
         node_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 }
+      described_class.add_selector :custom_css_selector do
+        css(:name, :other_name) do |selector, name: nil, **|
+          selector ||= ''
+          selector += "[name='#{name}']" if name
+          selector
+        end
+        expression_filter(:placeholder) do |expr, val|
+          expr + "[placeholder='#{val}']"
+        end
+        expression_filter(:value) do |expr, val|
+          expr + "[value='#{val}']"
+        end
+        expression_filter(:title) do |expr, val|
+          expr + "[title='#{val}']"
+        end
       end
-      Capybara.add_selector :custom_xpath_selector do
-        xpath { |selector| selector }
+      described_class.add_selector :custom_xpath_selector do
+        xpath(:valid1, :valid2) { |selector| selector }
+        match { |value| value == 'match_me' }
       end
     end
     it 'supports `filter` as an alias for `node_filter`' do
       expect do
-        Capybara.add_selector :filter_alias_selector do
+        described_class.add_selector :filter_alias_selector do
           css { |_unused| 'div' }
           filter(:something) { |_node, _value| true }
         end
@@ -72,7 +111,7 @@ RSpec.describe Capybara do
     describe 'adding a selector' do
       it 'can set default visiblity' do
-        Capybara.add_selector :hidden_field do
+        described_class.add_selector :hidden_field do
           visible :hidden
           css { |_sel| 'input[type="hidden"]' }
         end
@@ -84,22 +123,113 @@ RSpec.describe Capybara do
     describe 'modify_selector' do
       it 'allows modifying a selector' do
-        el = string.find(:custom_selector, 'a')
+        el = string.find(:custom_selector, 'aa')
         expect(el.tag_name).to eq 'div'
-        Capybara.modify_selector :custom_selector do
+        described_class.modify_selector :custom_selector do
           css { |css_class| "h1.#{css_class}" }
         end
-        el = string.find(:custom_selector, 'a')
+        el = string.find(:custom_selector, 'aa')
         expect(el.tag_name).to eq 'h1'
       end
       it "doesn't change existing filters" do
-        Capybara.modify_selector :custom_selector do
+        described_class.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)
+        expect(string).to have_selector(:custom_selector, 'bb', count: 1)
+        expect(string).to have_selector(:custom_selector, 'bb', not_empty: false, count: 1)
+        expect(string).to have_selector(:custom_selector, 'bb', not_empty: :all, count: 2)
+      end
+    end
+    describe '::[]' do
+      it 'can find a selector' do
+        expect(Capybara::Selector[:field]).not_to be_nil
+      end
+      it 'raises if no selector found' do
+        expect { Capybara::Selector[:no_exist] }.to raise_error(ArgumentError, /Unknown selector type/)
+      end
+    end
+    describe '::for' do
+      it 'finds selector that matches the locator' do
+        expect(Capybara::Selector.for('match_me').name).to eq :custom_xpath_selector
+      end
+      it 'returns nil if no match' do
+        expect(Capybara::Selector.for('nothing')).to be nil
+      end
+    end
+    describe 'xpath' do
+      it 'uses filter names passed in' do
+        described_class.add_selector :test do
+          xpath(:something, :other) { |_locator| XPath.descendant }
+        end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
+        expect(selector.expression_filters.keys).to include(:something, :other)
+      end
+      it 'gets filter names from block if none passed to xpath method' do
+        described_class.add_selector :test do
+          xpath { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
+        end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
+        expect(selector.expression_filters.keys).to include(:valid3, :valid4)
+      end
+      it 'ignores block parameters if names passed in' do
+        described_class.add_selector :test do
+          xpath(:valid1) { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
+        end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
+        expect(selector.expression_filters.keys).to include(:valid1)
+        expect(selector.expression_filters.keys).not_to include(:valid3, :valid4)
+      end
+    end
+    describe 'css' do
+      it "supports filters specified in 'css' definition" do
+        expect(string).to have_selector(:custom_css_selector, 'input', name: 'form[my_text_input]')
+        expect(string).to have_no_selector(:custom_css_selector, 'input', name: 'form[not_my_text_input]')
+      end
+      it 'supports explicitly defined expression filters' do
+        expect(string).to have_selector(:custom_css_selector, placeholder: 'my text')
+        expect(string).to have_no_selector(:custom_css_selector, placeholder: 'not my text')
+        expect(string).to have_selector(:custom_css_selector, value: 'click me', title: 'submit button')
+      end
+      it 'uses filter names passed in' do
+        described_class.add_selector :test do
+          css(:name, :other_name) { |_locator| '' }
+        end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
+        expect(selector.expression_filters.keys).to include(:name, :other_name)
+      end
+      it 'gets filter names from block if none passed to css method' do
+        described_class.add_selector :test do
+          css { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
+        end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
+        expect(selector.expression_filters.keys).to include(:valid3, :valid4)
+      end
+      it 'ignores block parameters if names passed in' do
+        described_class.add_selector :test do
+          css(:valid1) { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
+        end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
+        expect(selector.expression_filters.keys).to include(:valid1)
+        expect(selector.expression_filters.keys).not_to include(:valid3, :valid4)
       end
     end
@@ -147,19 +277,33 @@ RSpec.describe Capybara do
           expect { string.find(:custom_css_selector, 'div', id: XPath.contains('peci')) }
             .to raise_error(ArgumentError, /not supported/)
         end
+        it 'accepts Regexp for xpath based selectors' do
+          expect(string.find(:custom_xpath_selector, './/div', id: /peci/)[:id]).to eq '#special'
+          expect(string.find(:custom_xpath_selector, './/div', id: /pEcI/i)[:id]).to eq '#special'
+        end
+        it 'accepts Regexp for css based selectors' do
+          expect(string.find(:custom_css_selector, 'div', id: /sp.*al/)[:id]).to eq '#special'
+        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
+          expect(string.all(:custom_css_selector, 'div, h1', class: 'aa').size).to eq 2
+          expect(string.all(:custom_css_selector, 'h1, div', class: 'aa').size).to eq 2
         end
         it 'handles negated classes' do
-          expect(string.all(:custom_css_selector, 'div, p', class: ['b', '!c']).size).to eq 2
-          expect(string.all(:custom_css_selector, 'div, p', class: ['!c', '!d', 'b']).size).to eq 1
-          expect(string.all(:custom_xpath_selector, XPath.descendant(:div, :p), class: ['b', '!c']).size).to eq 2
-          expect(string.all(:custom_xpath_selector, XPath.descendant(:div, :p), class: ['!c', '!d', 'b']).size).to eq 1
+          expect(string.all(:custom_css_selector, 'div, p', class: ['bb', '!cc']).size).to eq 2
+          expect(string.all(:custom_css_selector, 'div, p', class: ['!cc', '!dd', 'bb']).size).to eq 1
+          expect(string.all(:custom_xpath_selector, XPath.descendant(:div, :p), class: ['bb', '!cc']).size).to eq 2
+          expect(string.all(:custom_xpath_selector, XPath.descendant(:div, :p), class: ['!cc', '!dd', 'bb']).size).to eq 1
+        end
+        it 'handles classes starting with ! by requiring negated negated first' do
+          expect(string.all(:custom_css_selector, 'div, p', class: ['!!!mine']).size).to eq 1
+          expect(string.all(:custom_xpath_selector, XPath.descendant(:div, :p), class: ['!!!mine']).size).to eq 1
         end
         it "works with 'special' characters" do
@@ -176,6 +320,25 @@ RSpec.describe Capybara do
           expect { string.find(:custom_css_selector, 'div', class: XPath.contains('random')) }
             .to raise_error(ArgumentError, /not supported/)
         end
+        it 'accepts Regexp for XPath based selectors' do
+          expect(string.find(:custom_xpath_selector, './/div', class: /dom wor/)[:id]).to eq 'random_words'
+          expect(string.find(:custom_xpath_selector, './/div', class: /dOm WoR/i)[:id]).to eq 'random_words'
+        end
+        it 'accepts Regexp for CSS base selectors' do
+          expect(string.find(:custom_css_selector, 'div', class: /random/)[:id]).to eq 'random_words'
+        end
+      end
+      context 'with :style option' do
+        it 'accepts string for CSS based selectors' do
+          expect(string.find(:custom_css_selector, 'input', style: 'line-height: 30px;')[:title]).to eq 'Other button 1'
+        end
+        it 'accepts Regexp for CSS base selectors' do
+          expect(string.find(:custom_css_selector, 'input', style: /30px/)[:title]).to eq 'Other button 1'
+        end
       end
       # :css, :xpath, :id, :field, :fieldset, :link, :button, :link_or_button, :fillable_field, :radio_button, :checkbox, :select,
@@ -196,6 +359,9 @@ RSpec.describe Capybara do
       describe ':id selector' do
         it 'finds by locator' do
           expect(string.find(:id, 'my_text_input')[:name]).to eq 'form[my_text_input]'
+          expect(string.find(:id, /my_text_input/)[:name]).to eq 'form[my_text_input]'
+          expect(string.find(:id, /_text_/)[:name]).to eq 'form[my_text_input]'
+          expect(string.find(:id, /i[nmo]/)[:name]).to eq 'form[my_text_input]'
         end
       end
@@ -206,10 +372,14 @@ RSpec.describe Capybara do
           expect(string.find(:field, 'form[my_text_input]')[:id]).to eq 'my_text_input'
         end
-        it 'finds by id' do
+        it 'finds by id string' do
           expect(string.find(:field, id: 'my_text_input')[:name]).to eq 'form[my_text_input]'
         end
+        it 'finds by id regexp' do
+          expect(string.find(:field, id: /my_text_inp/)[: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
@@ -257,6 +427,18 @@ RSpec.describe Capybara do
           expect(string.find(:element, 'input', type: 'submit').value).to eq 'click me'
         end
+        it 'supports regexp matching' do
+          expect(string.find(:element, 'input', type: /sub/).value).to eq 'click me'
+          expect(string.find(:element, 'input', title: /sub\w.*button/).value).to eq 'click me'
+          expect(string.find(:element, 'input', title: /sub.* b.*ton/).value).to eq 'click me'
+          expect(string.find(:element, 'input', title: /sub.*mit.*/).value).to eq 'click me'
+          expect(string.find(:element, 'input', title: /^submit button$/).value).to eq 'click me'
+          expect(string.find(:element, 'input', title: /^(?:submit|other) button$/).value).to eq 'click me'
+          expect(string.find(:element, 'input', title: /SuB.*mIt/i).value).to eq 'click me'
+          expect(string.find(:element, 'input', title: /^Su.*Bm.*It/i).value).to eq 'click me'
+          expect(string.find(:element, 'input', title: /^Ot.*he.*r b.*\d/i).value).to eq "don't click me"
+        end
         it 'still works with system keys' do
           expect { string.all(:element, 'input', type: 'submit', count: 1) }.not_to raise_error
         end
@@ -289,7 +471,41 @@ RSpec.describe Capybara do
           expect(string.find(:element, 'input', type: XPath.ends_with('ext'))[:type]).to eq 'text'
           expect(string.find(:element, 'input', type: XPath.contains('ckb'))[:type]).to eq 'checkbox'
           expect(string.find(:element, 'input', title: XPath.contains_word('submit'))[:type]).to eq 'submit'
-          expect(string.find(:element, 'input', title: XPath.contains_word('button'))[:type]).to eq 'submit'
+          expect(string.find(:element, 'input', title: XPath.contains_word('button 1'))[:type]).to eq 'button'
+        end
+      end
+      describe ':link_or_button selector' do
+        around do |example|
+          described_class.modify_selector(:link_or_button) do
+            expression_filter(:random) { |xpath, _| xpath } # do nothing filter
+          end
+          example.run
+          Capybara::Selector[:link_or_button].expression_filters.delete(:random)
+        end
+        it 'should not find links when disabled == true' do
+          expect(string.all(:link_or_button, disabled: true).size).to eq 0
+        end
+        context 'when modified' do
+          it 'should still work' do
+            filter = Capybara::Selector[:link_or_button].expression_filters[:random]
+            allow(filter).to receive(:apply_filter).and_call_original
+            expect(string.find(:link_or_button, 'click me', random: 'blah').value).to eq 'click me'
+            expect(filter).to have_received(:apply_filter).with(anything, :random, 'blah', anything)
+          end
+        end
+      end
+      describe ':table selector' do
+        it 'finds by rows' do
+          expect(string.find(:table, with_rows: [%w[D E F]])[:id]).to eq 'rows'
+        end
+        it 'finds by columns' do
+          expect(string.find(:table, with_cols: [%w[A B C]])[:id]).to eq 'cols'
         end
       end
     end

data/spec/selenium_spec_chrome.rb CHANGED Viewed

@@ -3,36 +3,55 @@
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
-CHROME_DRIVER = ENV['HEADLESS'] ? :selenium_chrome_headless : :selenium_chrome
+CHROME_DRIVER = :selenium_chrome
-# if ENV['HEADLESS'] && ENV['TRAVIS']
-#   Selenium::WebDriver::Chrome.path='/usr/bin/google-chrome-beta'
-# end
+Selenium::WebDriver::Chrome.path = '/usr/bin/google-chrome-beta' if ENV['CI'] && ENV['CHROME_BETA']
+browser_options = ::Selenium::WebDriver::Chrome::Options.new
+browser_options.headless! if ENV['HEADLESS']
+browser_options.add_option(:w3c, ENV['W3C'] != 'false')
+# Chromedriver 77 requires setting this for headless mode on linux
+# Different versions of Chrome/selenium-webdriver require setting differently - jus set them all
+browser_options.add_preference('download.default_directory', Capybara.save_path)
+browser_options.add_preference(:download, default_directory: Capybara.save_path)
 Capybara.register_driver :selenium_chrome do |app|
-  driver = Capybara::Selenium::Driver.new(app, browser: :chrome)
-  driver.browser.download_path = Capybara.save_path
-  driver
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options, timeout: 30).tap do |driver|
+    # Set download dir for Chrome < 77
+    driver.browser.download_path = Capybara.save_path
+  end
 end
-Capybara.register_driver :selenium_chrome_headless do |app|
-  browser_options = ::Selenium::WebDriver::Chrome::Options.new
-  browser_options.args << '--headless'
-  browser_options.args << '--disable-gpu' if Gem.win_platform?
-  driver = Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
-  driver.browser.download_path = Capybara.save_path
-  driver
+Capybara.register_driver :selenium_chrome_not_clear_storage do |app|
+  chrome_options = {
+    browser: :chrome,
+    options: browser_options
+  }
+  Capybara::Selenium::Driver.new(app, **chrome_options.merge(clear_local_storage: false, clear_session_storage: false))
 end
-Capybara.register_driver :selenium_chrome_clear_storage do |app|
+Capybara.register_driver :selenium_chrome_not_clear_session_storage do |app|
   chrome_options = {
     browser: :chrome,
-    options: ::Selenium::WebDriver::Chrome::Options.new
+    options: browser_options
   }
-  chrome_options[:options].args << 'headless' if ENV['HEADLESS']
-  Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: true, clear_session_storage: true))
+  Capybara::Selenium::Driver.new(app, **chrome_options.merge(clear_session_storage: false))
+end
+Capybara.register_driver :selenium_chrome_not_clear_local_storage do |app|
+  chrome_options = {
+    browser: :chrome,
+    options: browser_options
+  }
+  Capybara::Selenium::Driver.new(app, **chrome_options.merge(clear_local_storage: false))
+end
+Capybara.register_driver :selenium_driver_subclass_with_chrome do |app|
+  subclass = Class.new(Capybara::Selenium::Driver)
+  subclass.new(app, browser: :chrome, options: browser_options, timeout: 30)
 end
 module TestSessions
@@ -40,76 +59,128 @@ module TestSessions
 end
 skipped_tests = %i[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'])
-$stdout.puts `#{Selenium::WebDriver::Chrome.driver_path} --version` if ENV['CI']
+Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Chrome) if ENV['CI']
 Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
   when /#click_link can download a file$/
     skip 'Need to figure out testing of file downloading on windows platform' if Gem.win_platform?
+  when /Capybara::Session selenium_chrome Capybara::Window#maximize/
+    pending "Chrome headless doesn't support maximize" if ENV['HEADLESS']
+  when /Capybara::Window#fullscreen should be able to fullscreen the window/
+    skip 'Chromedriver hangs on attempts to fullscreen in headless mode' if ENV['HEADLESS']
+  when /node #right_click delay should delay the mouse up/
+    skip "Legacy selenium doesn't support separate right button down/up" if ENV['W3C'] == 'false'
   end
 end
 RSpec.describe 'Capybara::Session with chrome' do
   include Capybara::SpecHelper
-  include_examples  'Capybara::Session', TestSessions::Chrome, CHROME_DRIVER
-  include_examples  Capybara::RSpecMatchers, TestSessions::Chrome, CHROME_DRIVER
+  ['Capybara::Session', 'Capybara::Node', Capybara::RSpecMatchers].each do |examples|
+    include_examples examples, TestSessions::Chrome, CHROME_DRIVER
+  end
   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
+      it 'clears 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.evaluate_script('Object.keys(localStorage)')).to be_empty
+        expect(session.evaluate_script('Object.keys(sessionStorage)')).to be_empty
+      end
+      it 'does not clear storage when false' do
+        session = Capybara::Session.new(:selenium_chrome_not_clear_storage, TestApp)
+        session.visit('/with_js')
+        session.find(:css, '#set-storage').click
+        session.reset!
+        session.visit('/with_js')
+        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
+      it 'can not clear session storage' do
+        session = Capybara::Session.new(:selenium_chrome_not_clear_session_storage, TestApp)
+        session.visit('/with_js')
+        session.find(:css, '#set-storage').click
+        session.reset!
+        session.visit('/with_js')
+        expect(session.evaluate_script('Object.keys(localStorage)')).to be_empty
+        expect(session.evaluate_script('Object.keys(sessionStorage)')).not_to be_empty
+      end
+      it 'can not clear local storage' do
+        session = Capybara::Session.new(:selenium_chrome_not_clear_local_storage, TestApp)
+        session.visit('/with_js')
+        session.find(:css, '#set-storage').click
+        session.reset!
+        session.visit('/with_js')
+        expect(session.evaluate_script('Object.keys(localStorage)')).not_to be_empty
+        expect(session.evaluate_script('Object.keys(sessionStorage)')).to be_empty
       end
     end
   end
+  context 'timeout' do
+    it 'sets the http client read timeout' do
+      expect(TestSessions::Chrome.driver.browser.send(:bridge).http.read_timeout).to eq 30
+    end
+  end
   describe 'filling in Chrome-specific date and time fields with keystrokes' do
     let(:datetime) { Time.new(1983, 6, 19, 6, 30) }
+    let(:session) { TestSessions::Chrome }
     before do
-      @session = TestSessions::Chrome
-      @session.visit('/form')
+      session.visit('/form')
     end
     it 'should fill in a date input with a String' do
-      @session.fill_in('form_date', with: "06/19/1983")
-      @session.click_button('awesome')
-      expect(Date.parse(extract_results(@session)['date'])).to eq datetime.to_date
+      session.fill_in('form_date', with: '06/19/1983')
+      session.click_button('awesome')
+      expect(Date.parse(extract_results(session)['date'])).to eq datetime.to_date
     end
     it 'should fill in a time input with a String' do
-      @session.fill_in('form_time', with: "06:30A")
-      @session.click_button('awesome')
-      results = extract_results(@session)['time']
+      session.fill_in('form_time', with: '06:30A')
+      session.click_button('awesome')
+      results = extract_results(session)['time']
       expect(Time.parse(results).strftime('%r')).to eq datetime.strftime('%r')
     end
     it 'should fill in a datetime input with a String' do
-      @session.fill_in('form_datetime', with: "06/19/1983\t06:30A")
-      @session.click_button('awesome')
-      expect(Time.parse(extract_results(@session)['datetime'])).to eq datetime
+      session.fill_in('form_datetime', with: "06/19/1983\t06:30A")
+      session.click_button('awesome')
+      expect(Time.parse(extract_results(session)['datetime'])).to eq datetime
+    end
+  end
+  describe 'using subclass of selenium driver' do
+    it 'works' do
+      session = Capybara::Session.new(:selenium_driver_subclass_with_chrome, TestApp)
+      session.visit('/form')
+      expect(session).to have_current_path('/form')
+    end
+  end
+  describe 'log access' do
+    before { skip 'Only makes sense in W3C mode' if ENV['W3C'] == 'false' }
+    it 'does not error getting log types' do
+      skip if Gem::Version.new(session.driver.browser.capabilities['chrome']['chromedriverVersion'].split[0]) < Gem::Version.new('75.0.3770.90')
+      expect do
+        session.driver.browser.manage.logs.available_types
+      end.not_to raise_error
+    end
+    it 'does not error when getting logs' do
+      expect do
+        session.driver.browser.manage.logs.get(:browser)
+      end.not_to raise_error
     end
   end
 end