capybara 3.11.1 → 3.12.0

data/lib/capybara/selenium/driver.rb

@@ -6,10 +6,10 @@ require 'English'
 class Capybara::Selenium::Driver < Capybara::Driver::Base
   DEFAULT_OPTIONS = {
     browser: :firefox,
-    clear_local_storage: false,
-    clear_session_storage: false
+    clear_local_storage: nil,
+    clear_session_storage: nil
   }.freeze
-  SPECIAL_OPTIONS = %i[browser clear_local_storage clear_session_storage].freeze
+  SPECIAL_OPTIONS = %i[browser clear_local_storage clear_session_storage timeout].freeze
   attr_reader :app, :options
 
   def self.load_selenium
@@ -23,6 +23,9 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
   def browser
     @browser ||= begin
+      if options[:timeout]
+        options[:http_client] ||= Selenium::WebDriver::Remote::Http::Default.new(read_timeout: options[:timeout])
+      end
       processed_options = options.reject { |key, _val| SPECIAL_OPTIONS.include?(key) }
       Selenium::WebDriver.for(options[:browser], processed_options).tap do |driver|
         specialize_driver(driver)
@@ -260,15 +263,17 @@ private
   end
 
   def clear_storage
-    clear_session_storage if options[:clear_session_storage]
-    clear_local_storage if options[:clear_local_storage]
+    clear_session_storage unless options[:clear_session_storage] == false
+    clear_local_storage unless options[:clear_local_storage] == false
+  rescue Selenium::WebDriver::Error::JavascriptError # rubocop:disable Lint/HandleExceptions
+    # session/local storage may not be available if on non-http pages (e.g. about:blank)
   end
 
   def clear_session_storage
     if @browser.respond_to? :session_storage
       @browser.session_storage.clear
     else
-      warn 'sessionStorage clear requested but is not available for this driver'
+      warn 'sessionStorage clear requested but is not supported by this driver' unless options[:clear_session_storage].nil?
     end
   end
 
@@ -276,7 +281,7 @@ private
     if @browser.respond_to? :local_storage
       @browser.local_storage.clear
     else
-      warn 'localStorage clear requested but is not available for this driver'
+      warn 'localStorage clear requested but is not supported by this driver' unless options[:clear_local_storage].nil?
     end
   end
 
@@ -353,7 +358,7 @@ private
       extend ChromeDriver
     when :firefox
       require 'capybara/selenium/patches/pause_duration_fix' if pause_broken?(sel_driver)
-      extend MarionetteDriver if sel_driver.capabilities.is_a?(::Selenium::WebDriver::Remote::W3C::Capabilities)
+      extend FirefoxDriver if sel_driver.capabilities.is_a?(::Selenium::WebDriver::Remote::W3C::Capabilities)
     end
   end
 
@@ -396,4 +401,4 @@ private
 end
 
 require 'capybara/selenium/driver_specializations/chrome_driver'
-require 'capybara/selenium/driver_specializations/marionette_driver'
+require 'capybara/selenium/driver_specializations/firefox_driver'

data/lib/capybara/selenium/driver_specializations/{marionette_driver.rb → firefox_driver.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'capybara/selenium/nodes/marionette_node'
+require 'capybara/selenium/nodes/firefox_node'
 
-module Capybara::Selenium::Driver::MarionetteDriver
+module Capybara::Selenium::Driver::FirefoxDriver
   def resize_window_to(handle, width, height)
     within_given_window(handle) do
       # Don't set the size if already set - See https://github.com/mozilla/geckodriver/issues/643
@@ -45,6 +45,6 @@ module Capybara::Selenium::Driver::MarionetteDriver
 private
 
   def build_node(native_node)
-    ::Capybara::Selenium::MarionetteNode.new(self, native_node)
+    ::Capybara::Selenium::FirefoxNode.new(self, native_node)
   end
 end

data/lib/capybara/selenium/nodes/{marionette_node.rb → firefox_node.rb}

@@ -2,7 +2,7 @@
 
 require 'capybara/selenium/extensions/html5_drag'
 
-class Capybara::Selenium::MarionetteNode < Capybara::Selenium::Node
+class Capybara::Selenium::FirefoxNode < Capybara::Selenium::Node
   include Html5Drag
 
   def click(keys = [], **options)

data/lib/capybara/spec/session/all_spec.rb

@@ -30,7 +30,7 @@ Capybara::SpecHelper.spec '#all' do
 
   it 'should accept an XPath instance', :exact_false do
     @session.visit('/form')
-    @xpath = Capybara::Selector.all[:fillable_field].call('Name')
+    @xpath = Capybara::Selector[:fillable_field].call('Name')
     expect(@xpath).to be_a(::XPath::Union)
     @result = @session.all(@xpath).map(&:value)
     expect(@result).to include('Smith', 'John', 'John Smith')
@@ -135,6 +135,13 @@ Capybara::SpecHelper.spec '#all' do
       it 'should raise ExpectationNotMet when the number of elements founds does not match the expectation' do
         expect { @session.all(:css, 'h1, p', between: 0..3) }.to raise_error(Capybara::ExpectationNotMet)
       end
+
+      eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.5
+        it'treats an endless range as minimum' do
+          expect { @session.all(:css, 'h1, p', between: 2..) }.not_to raise_error
+          expect { @session.all(:css, 'h1, p', between: 5..) }.to raise_error(Capybara::ExpectationNotMet)
+        end
+      TEST
     end
 
     context 'with multiple count filters' do

data/lib/capybara/spec/session/assert_selector_spec.rb

@@ -72,16 +72,6 @@ Capybara::SpecHelper.spec '#assert_selector' do
   end
 end
 
-Capybara::SpecHelper.spec '#refute_selector', requires: [:driver] do
-  it 'should warn not to use' do
-    @session.visit('/with_html')
-    doc = @session.document
-    allow(doc).to receive(:warn)
-    doc.refute_selector(:xpath, '//abbr')
-    expect(doc).to have_received(:warn)
-  end
-end
-
 Capybara::SpecHelper.spec '#assert_no_selector' do
   before do
     @session.visit('/with_html')

data/lib/capybara/spec/session/click_button_spec.rb

@@ -5,10 +5,12 @@ Capybara::SpecHelper.spec '#click_button' do
     @session.visit('/form')
   end
 
-  it 'should wait for asynchronous load', requires: [:js] do
+  it 'should wait for asynchronous load', :focus_, requires: [:js] do
     @session.visit('/with_js')
-    @session.click_link('Click me')
-    @session.click_button('New Here')
+    @session.using_wait_time(1.5) do
+      @session.click_link('Click me')
+      @session.click_button('New Here')
+    end
   end
 
   it 'casts to string' do

data/lib/capybara/spec/session/click_link_spec.rb

@@ -83,7 +83,7 @@ Capybara::SpecHelper.spec '#click_link' do
     end
 
     it "should raise error if link wasn't found" do
-      expect { @session.click_link('labore', href: 'invalid_href') }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.click_link('labore', href: 'invalid_href') }.to raise_error(Capybara::ElementNotFound, /with href "invalid_href/)
     end
   end
 
@@ -104,8 +104,8 @@ Capybara::SpecHelper.spec '#click_link' do
     end
 
     it "should raise an error if no link's href matched the pattern" do
-      expect { @session.click_link('labore', href: /invalid_pattern/) }.to raise_error(Capybara::ElementNotFound)
-      expect { @session.click_link('labore', href: /.+d+/) }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.click_link('labore', href: /invalid_pattern/) }.to raise_error(Capybara::ElementNotFound, %r{with href matching /invalid_pattern/})
+      expect { @session.click_link('labore', href: /.+d+/) }.to raise_error(Capybara::ElementNotFound, /#{Regexp.quote "with href matching /.+d+/"}/)
     end
 
     context 'href: nil' do
@@ -114,8 +114,8 @@ Capybara::SpecHelper.spec '#click_link' do
       end
 
       it 'should raise an error if href attribute exists' do
-        expect { @session.click_link('Blank Href', href: nil) }.to raise_error(Capybara::ElementNotFound)
-        expect { @session.click_link('Normal Anchor', href: nil) }.to raise_error(Capybara::ElementNotFound)
+        expect { @session.click_link('Blank Href', href: nil) }.to raise_error(Capybara::ElementNotFound, /with no href attribute/)
+        expect { @session.click_link('Normal Anchor', href: nil) }.to raise_error(Capybara::ElementNotFound, /with no href attribute/)
       end
     end
   end

data/lib/capybara/spec/session/find_spec.rb

@@ -224,7 +224,7 @@ Capybara::SpecHelper.spec '#find' do
 
   it 'should accept an XPath instance' do
     @session.visit('/form')
-    @xpath = Capybara::Selector.all[:fillable_field].call('First Name')
+    @xpath = Capybara::Selector[:fillable_field].call('First Name')
     expect(@xpath).to be_a(::XPath::Union)
     expect(@session.find(@xpath).value).to eq('John')
   end

data/lib/capybara/spec/session/first_spec.rb

@@ -24,7 +24,7 @@ Capybara::SpecHelper.spec '#first' do
 
   it 'should accept an XPath instance' do
     @session.visit('/form')
-    @xpath = Capybara::Selector.all[:fillable_field].call('First Name')
+    @xpath = Capybara::Selector[:fillable_field].call('First Name')
     expect(@xpath).to be_a(::XPath::Union)
     expect(@session.first(@xpath).value).to eq('John')
   end

data/lib/capybara/spec/session/has_css_spec.rb

@@ -27,11 +27,15 @@ Capybara::SpecHelper.spec '#has_css?' do
     expect(@session).to have_css('h2', id: 'h2one')
     expect(@session).to have_css('h2')
     expect(@session).to have_css('h2', id: /h2o/)
+    expect(@session).to have_css('li', id: /john|paul/)
   end
 
   it 'should support :class option' do
     expect(@session).to have_css('li', class: 'guitarist')
     expect(@session).to have_css('li', class: /guitar/)
+    expect(@session).to have_css('li', class: /guitar|drummer/)
+    expect(@session).to have_css('li', class: %w[beatle guitarist])
+    expect(@session).to have_css('li', class: /.*/)
   end
 
   it 'should support case insensitive :class and :id options' do
@@ -111,6 +115,9 @@ Capybara::SpecHelper.spec '#has_css?' do
       expect(@session).to have_css('p', count: 3)
       expect(@session).to have_css('p a#foo', count: 1)
       expect(@session).to have_css('p a.doesnotexist', count: 0)
+      expect(@session).to have_css('li', class: /guitar|drummer/, count: 4)
+      expect(@session).to have_css('li', id: /john|paul/, class: /guitar|drummer/, count: 2)
+      expect(@session).to have_css('li', class: %w[beatle guitarist], count: 2)
     end
 
     it 'should be false if the content occurs a different number of times than the given' do

data/lib/capybara/spec/session/has_xpath_spec.rb

@@ -11,6 +11,20 @@ Capybara::SpecHelper.spec '#has_xpath?' do
     expect(@session).to have_xpath("//p[contains(.,'est')]")
   end
 
+  it 'should support :id option' do
+    expect(@session).to have_xpath('//h2', id: 'h2one')
+    expect(@session).to have_xpath('//h2')
+    expect(@session).to have_xpath('//h2', id: /h2o/)
+  end
+
+  it 'should support :class option' do
+    expect(@session).to have_xpath('//li', class: 'guitarist')
+    expect(@session).to have_xpath('//li', class: /guitar/)
+    expect(@session).to have_xpath('//li', class: /guitar|drummer/)
+    expect(@session).to have_xpath('//li', class: %w[beatle guitarist])
+    expect(@session).to have_xpath('//li', class: /.*/)
+  end
+
   it 'should be false if the given selector is not on the page' do
     expect(@session).not_to have_xpath('//abbr')
     expect(@session).not_to have_xpath("//p//a[@id='doesnotexist']")
@@ -43,6 +57,9 @@ Capybara::SpecHelper.spec '#has_xpath?' do
       expect(@session).to have_xpath("//p//a[@id='foo']", count: 1)
       expect(@session).to have_xpath("//p[contains(.,'est')]", count: 1)
       expect(@session).to have_xpath("//p//a[@id='doesnotexist']", count: 0)
+      expect(@session).to have_xpath('//li', class: /guitar|drummer/, count: 4)
+      expect(@session).to have_xpath('//li', id: /john|paul/, class: /guitar|drummer/, count: 2)
+      expect(@session).to have_xpath('//li', class: %w[beatle guitarist], count: 2)
     end
 
     it 'should be false if the content occurs a different number of times than the given' do

data/lib/capybara/spec/session/node_spec.rb

@@ -406,6 +406,13 @@ Capybara::SpecHelper.spec 'node' do
       expect(locations[:y].to_f).to be_within(1).of(5)
     end
 
+    it 'should raise error if both x and y values are not passed' do
+      @session.visit('with_js')
+      el = @session.find(:css, '#click-test')
+      expect { el.click(x: 5) }.to raise_error ArgumentError
+      expect { el.click(x: nil, y: 3) }.to raise_error ArgumentError
+    end
+
     it 'should be able to click a table row', requires: [:js] do
       @session.visit('/tables')
       tr = @session.find(:css, '#agent_table tr:first-child').click
@@ -416,7 +423,7 @@ Capybara::SpecHelper.spec 'node' do
       @session.visit('/obscured')
       obscured = @session.find(:css, '#obscured')
       @session.execute_script <<~JS
-        setTimeout(function(){ $('#cover').hide(); }, 1000)
+        setTimeout(function(){ $('#cover').hide(); }, 700)
       JS
       expect { obscured.click }.not_to raise_error
     end
@@ -468,7 +475,7 @@ Capybara::SpecHelper.spec 'node' do
       @session.visit('/obscured')
       obscured = @session.find(:css, '#obscured')
       @session.execute_script <<~JS
-        setTimeout(function(){ $('#cover').hide(); }, 1000)
+        setTimeout(function(){ $('#cover').hide(); }, 700)
       JS
       expect { obscured.double_click }.not_to raise_error
     end
@@ -502,7 +509,7 @@ Capybara::SpecHelper.spec 'node' do
       @session.visit('/obscured')
       obscured = @session.find(:css, '#obscured')
       @session.execute_script <<~JS
-        setTimeout(function(){ $('#cover').hide(); }, 1000)
+        setTimeout(function(){ $('#cover').hide(); }, 700)
       JS
       expect { obscured.right_click }.not_to raise_error
     end

data/lib/capybara/spec/session/window/window_spec.rb

@@ -120,7 +120,7 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
 
     after do
       @session.current_window.resize_to(*@initial_size)
-      sleep 0.5
+      sleep 1
     end
 
     it 'should be able to resize window', requires: %i[windows js] do
@@ -194,7 +194,7 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
 
     after do
       @session.current_window.resize_to(*@initial_size)
-      sleep 0.5
+      sleep 1
     end
 
     it 'should be able to fullscreen the window' do

data/lib/capybara/spec/spec_helper.rb

@@ -16,8 +16,7 @@ module Capybara
         config.filter_run_excluding requires: method(:filter).to_proc
         config.before { Capybara::SpecHelper.reset! }
         config.after { Capybara::SpecHelper.reset! }
-        # Test in 3.5+ where metadata doesn't autotrigger shared context inclusion - will be only behavior in RSpec 4
-        config.shared_context_metadata_behavior = :apply_to_host_groups if config.respond_to?(:shared_context_metadata_behavior=)
+        config.shared_context_metadata_behavior = :apply_to_host_groups
       end
 
       def reset!

data/lib/capybara/spec/views/obscured.erb

@@ -3,6 +3,9 @@
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>with_animation</title>
     <script src="/jquery.js" type="text/javascript" charset="utf-8"></script>
+    <script>
+      $(document).on('contextmenu', function(e){ e.preventDefault(); })
+    </script>
     <style>
       div {
         width: 400px;

data/lib/capybara/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capybara
-  VERSION = '3.11.1'
+  VERSION = '3.12.0'
 end

data/spec/css_builder_spec.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Capybara::Selector::CSSBuilder do
+  let :builder do
+    ::Capybara::Selector::CSSBuilder.new(@css)
+  end
+
+  context 'add_attribute_conditions' do
+    it 'adds a single string condition to a single selector' do
+      @css = 'div'
+      selector = builder.add_attribute_conditions(random: 'abc')
+      expect(selector).to eq %(div[random='abc'])
+    end
+
+    it 'adds multiple string conditions to a single selector' do
+      @css = 'div'
+      selector = builder.add_attribute_conditions(random: 'abc', other: 'def')
+      expect(selector).to eq %(div[random='abc'][other='def'])
+    end
+
+    it 'adds a single string condition to a multiple selector' do
+      @css = 'div, ul'
+      selector = builder.add_attribute_conditions(random: 'abc')
+      expect(selector).to eq %(div[random='abc'], ul[random='abc'])
+    end
+
+    it 'adds multiple string conditions to a multiple selector' do
+      @css = 'div, ul'
+      selector = builder.add_attribute_conditions(random: 'abc', other: 'def')
+      expect(selector).to eq %(div[random='abc'][other='def'], ul[random='abc'][other='def'])
+    end
+
+    it 'adds simple regexp conditions to a single selector' do
+      @css = 'div'
+      selector = builder.add_attribute_conditions(random: /abc/, other: /def/)
+      expect(selector).to eq %(div[random*='abc'][other*='def'])
+    end
+
+    it 'adds wildcard regexp conditions to a single selector' do
+      @css = 'div'
+      selector = builder.add_attribute_conditions(random: /abc.*def/, other: /def.*ghi/)
+      expect(selector).to eq %(div[random*='abc'][random*='def'][other*='def'][other*='ghi'])
+    end
+
+    it 'adds alternated regexp conditions to a single selector' do
+      @css = 'div'
+      selector = builder.add_attribute_conditions(random: /abc|def/, other: /def|ghi/)
+      expect(selector).to eq %(div[random*='abc'][other*='def'], div[random*='abc'][other*='ghi'], div[random*='def'][other*='def'], div[random*='def'][other*='ghi'])
+    end
+
+    it 'adds alternated regexp conditions to a multiple selector' do
+      @css = 'div,ul'
+      selector = builder.add_attribute_conditions(other: /def.*ghi|jkl/)
+      expect(selector).to eq %(div[other*='def'][other*='ghi'], div[other*='jkl'], ul[other*='def'][other*='ghi'], ul[other*='jkl'])
+    end
+
+    it "returns original selector when regexp can't be substringed" do
+      @css = 'div'
+      selector = builder.add_attribute_conditions(other: /.+/)
+      expect(selector).to eq 'div'
+    end
+
+    context ':class' do
+      it 'handles string with CSS .' do
+        @css = 'a'
+        selector = builder.add_attribute_conditions(class: 'my_class')
+        expect(selector).to eq 'a.my_class'
+      end
+
+      it 'handles negated string with CSS .' do
+        @css = 'a'
+        selector = builder.add_attribute_conditions(class: '!my_class')
+        expect(selector).to eq 'a:not(.my_class)'
+      end
+
+      it 'handles array of string with CSS .' do
+        @css = 'a'
+        selector = builder.add_attribute_conditions(class: %w[my_class my_other_class])
+        expect(selector).to eq 'a.my_class.my_other_class'
+      end
+
+      it 'handles array of string with CSS . when negated included' do
+        @css = 'a'
+        selector = builder.add_attribute_conditions(class: %w[my_class !my_other_class])
+        expect(selector).to eq 'a.my_class:not(.my_other_class)'
+      end
+    end
+
+    context ':id' do
+      it 'handles string with CSS #' do
+        @css = 'ul'
+        selector = builder.add_attribute_conditions(id: 'my_id')
+        expect(selector).to eq 'ul#my_id'
+      end
+    end
+  end
+end