capybara 3.6.0 → 3.7.0

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

@@ -45,11 +45,12 @@ Capybara::SpecHelper.spec '#text' do
   context 'with css as default selector' do
     before { Capybara.default_selector = :css }
 
+    after { Capybara.default_selector = :xpath }
+
     it 'should print the text of the page' do
       @session.visit('/with_simple_html')
       expect(@session.text).to eq('Bar')
     end
-    after { Capybara.default_selector = :xpath }
   end
 
   it 'should be correctly normalized when visible' do

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

@@ -9,11 +9,12 @@ Capybara::SpecHelper.spec '#title' do
   context 'with css as default selector' do
     before { Capybara.default_selector = :css }
 
+    after { Capybara.default_selector = :xpath }
+
     it 'should get the title of the page' do
       @session.visit('/with_title')
       expect(@session.title).to eq('Test Title')
     end
-    after { Capybara.default_selector = :xpath }
   end
 
   context 'within iframe', requires: [:frames] do

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

@@ -26,6 +26,14 @@ Capybara::SpecHelper.spec '#uncheck' do
     expect(extract_results(@session)['pets']).not_to include('hamster')
   end
 
+  it 'should be able to uncheck itself if no locator specified' do
+    cb = @session.find(:id, 'form_pets_hamster')
+    cb.uncheck
+    @session.click_button('awesome')
+    expect(extract_results(@session)['pets']).to include('dog')
+    expect(extract_results(@session)['pets']).not_to include('hamster')
+  end
+
   it 'casts to string' do
     @session.uncheck(:form_pets_hamster)
     @session.click_button('awesome')

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

@@ -60,13 +60,14 @@ Capybara::SpecHelper.spec '#within' do
   context 'with the default selector set to CSS' do
     before { Capybara.default_selector = :css }
 
+    after { Capybara.default_selector = :xpath }
+
     it 'should use CSS' do
       @session.within('#for_bar li', text: 'With Simple HTML') do
         @session.click_link('Go')
       end
       expect(@session).to have_content('Bar')
     end
-    after { Capybara.default_selector = :xpath }
   end
 
   context 'with nested scopes' do

data/lib/capybara/spec/spec_helper.rb

@@ -35,6 +35,7 @@ module Capybara
         Capybara.disable_animation = false
         Capybara.test_id = nil
         Capybara.predicates_wait = true
+        Capybara.default_normalize_ws = false
         reset_threadsafe
       end
 
@@ -118,38 +119,6 @@ module Capybara
       expect(session).to have_xpath("//pre[@id='results']")
       YAML.load Nokogiri::HTML(session.body).xpath("//pre[@id='results']").first.inner_html.lstrip
     end
-
-    def marionette?(session)
-      session.respond_to?(:driver) && session.driver.respond_to?(:marionette?, true) && session.driver.send(:marionette?)
-    end
-
-    def marionette_lt?(version, session)
-      marionette?(session) && (session.driver.browser.capabilities[:browser_version].to_f < version)
-    end
-
-    def marionette_gte?(version, session)
-      marionette?(session) && (session.driver.browser.capabilities[:browser_version].to_f >= version)
-    end
-
-    def chrome?(session)
-      session.respond_to?(:driver) && session.driver.respond_to?(:chrome?, true) && session.driver.send(:chrome?)
-    end
-
-    def chrome_lt?(version, session)
-      chrome?(session) && (session.driver.browser.capabilities[:version].to_f < version)
-    end
-
-    def chrome_gte?(version, session)
-      chrome?(session) && (session.driver.browser.capabilities[:version].to_f >= version)
-    end
-
-    def edge?(session)
-      session.respond_to?(:driver) && session.driver.respond_to?(:edge?, true) && session.driver.send(:edge?)
-    end
-
-    def ie?(session)
-      session.respond_to?(:driver) && session.driver.respond_to?(:ie?, true) && session.driver.send(:ie?)
-    end
   end
 end
 

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

@@ -18,7 +18,9 @@
     <div id="drop">
       <p>It should be dropped here.</p>
     </div>
-
+    <div id="drop_scroll">
+      <p>It should be dropped here.</p>
+    </div>
     <div id="drop_html5_scroll" class="drop">
       <p>It should be dropped here.</p>
     </div>
@@ -142,9 +144,6 @@
     <div id="drag_scroll">
       <p>This is a draggable element.</p>
     </div>
-    <div id="drop_scroll">
-      <p>It should be dropped here.</p>
-    </div>
     <div id="drag_html5_scroll" draggable="true">
       <p>This is an HTML5 draggable element.</p>
     </div>

data/lib/capybara/version.rb

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

data/spec/minitest_spec.rb

@@ -134,6 +134,10 @@ RSpec.describe 'capybara/minitest' do
     Capybara.app = TestApp
   end
 
+  after do
+    Capybara.use_default_driver
+  end
+
   it 'should support minitest' do
     output = StringIO.new
     reporter = Minitest::SummaryReporter.new(output)

data/spec/minitest_spec_spec.rb

@@ -130,6 +130,10 @@ RSpec.describe 'capybara/minitest/spec' do
     Capybara.app = TestApp
   end
 
+  after do
+    Capybara.use_default_driver
+  end
+
   it 'should support minitest spec' do
     output = StringIO.new
     reporter = Minitest::SummaryReporter.new(output)

data/spec/rack_test_spec.rb

@@ -40,6 +40,10 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
     end
 
     describe '#click_link' do
+      after do
+        @session.driver.options[:respect_data_method] = false
+      end
+
       it 'should use data-method if option is true' do
         @session.driver.options[:respect_data_method] = true
         @session.visit '/with_html'
@@ -60,10 +64,6 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
         @session.click_link 'A link with capitalized data-method'
         expect(@session.html).to include('The requested object was deleted')
       end
-
-      after do
-        @session.driver.options[:respect_data_method] = false
-      end
     end
 
     describe '#fill_in' do

data/spec/rspec/shared_spec_matchers.rb

@@ -325,12 +325,13 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
         context 'with default selector CSS' do
           before { Capybara.default_selector = :css }
 
+          after { Capybara.default_selector = :xpath }
+
           it 'fails if has_content? returns false' do
             expect do
               expect(page).to have_content('No such Text')
             end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
           end
-          after { Capybara.default_selector = :xpath }
         end
       end
 
@@ -461,12 +462,13 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
         context 'with default selector CSS' do
           before { Capybara.default_selector = :css }
 
+          after { Capybara.default_selector = :xpath }
+
           it 'fails if has_text? returns false' do
             expect do
               expect(page).to have_text('No such Text')
             end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
           end
-          after { Capybara.default_selector = :xpath }
         end
       end
 

data/spec/selector_spec.rb

@@ -261,11 +261,25 @@ RSpec.describe Capybara do
           expect { string.all(:element, 'input', type: 'submit', count: 1) }.not_to raise_error
         end
 
+        it 'works without element type' do
+          expect(string.find(:element, type: 'submit').value).to eq 'click me'
+        end
+
+        it 'validates attribute presence when true' do
+          expect(string.find(:element, name: true)[:id]).to eq 'my_text_input'
+        end
+
+        it 'validates attribute absence when false' do
+          expect(string.find(:element, 'option', disabled: false, selected: false).value).to eq 'a'
+        end
+
         it 'includes wildcarded keys in description' do
-          expect { string.find(:element, 'input', not_there: 'bad', count: 1) }
+          expect { string.find(:element, 'input', not_there: 'bad', presence: true, absence: false, count: 1) }
             .to(raise_error do |e|
               expect(e).to be_a(Capybara::ElementNotFound)
               expect(e.message).to include 'not_there => bad'
+              expect(e.message).to include 'with presence attribute'
+              expect(e.message).to include 'without absence attribute'
               expect(e.message).not_to include 'count 1'
             end)
         end

data/spec/selenium_spec_chrome.rb

@@ -45,12 +45,7 @@ skipped_tests << :windows if ENV['TRAVIS'] && (ENV['SKIP_WINDOW'] || ENV['HEADLE
 
 $stdout.puts `#{Selenium::WebDriver::Chrome.driver_path} --version` if ENV['CI']
 
-Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybara_skip: skipped_tests do |example|
-  case example.metadata[:description]
-  when /should fetch a response when sequentially visiting same destination with a target/
-    skip 'Chrome/chromedriver has an issue visiting URL with target after visiting same URL without target' if chrome_lt?(65.0, @session)
-  end
-end
+Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybara_skip: skipped_tests
 
 RSpec.describe 'Capybara::Session with chrome' do
   include Capybara::SpecHelper

data/spec/selenium_spec_chrome_remote.rb

@@ -77,6 +77,6 @@ RSpec.describe 'Capybara::Session with remote Chrome' do
   include_examples  Capybara::RSpecMatchers, TestSessions::Chrome, CHROME_REMOTE_DRIVER
 
   it 'is considered to be chrome' do
-    expect(session.driver.send(:chrome?)).to be_truthy
+    expect(session.driver.browser.browser).to eq :chrome
   end
 end

data/spec/selenium_spec_firefox_remote.rb

@@ -64,10 +64,8 @@ Capybara::SpecHelper.run_specs TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVE
     pending "Firefox doesn't generate an event for shift+control+click" if marionette_gte?(62, @session)
   when /^Capybara::Session selenium node #double_click/
     pending "selenium-webdriver/geckodriver doesn't generate double click event" if marionette_lt?(59, @session)
-  when 'Capybara::Session selenium_firefox_remote #refresh it reposts'
-    skip 'Firefox insists on prompting without providing a way to suppress'
   when 'Capybara::Session selenium_firefox_remote #accept_prompt should accept the prompt with a blank response when there is a default'
-    pending "Geckodriver doesn't set a blank response currently"
+    pending "Geckodriver doesn't set a blank response in FF < 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1486485" if marionette_lt?(63, @session)
   when 'Capybara::Session selenium_firefox_remote #attach_file with multipart form should fire change once for each set of files uploaded',
        'Capybara::Session selenium_firefox_remote #attach_file with multipart form should fire change once when uploading multiple files from empty'
     pending 'Due to having to work around selenium remote lack of multiple file upload support the change event count is off'
@@ -80,7 +78,6 @@ RSpec.describe 'Capybara::Session with remote firefox' do
   include_examples  Capybara::RSpecMatchers, TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVER
 
   it 'is considered to be firefox' do
-    expect(session.driver.send(:firefox?)).to be_truthy
-    expect(session.driver.send(:marionette?)).to be_truthy
+    expect(session.driver.browser.browser).to eq :firefox
   end
 end

data/spec/selenium_spec_ie.rb

@@ -7,10 +7,13 @@ require 'rspec/shared_spec_matchers'
 
 Capybara.register_driver :selenium_ie do |app|
   # ::Selenium::WebDriver.logger.level = "debug"
+  options = ::Selenium::WebDriver::IE::Options.new
+  options.require_window_focus = true
   Capybara::Selenium::Driver.new(
     app,
     browser: :ie,
-    desired_capabilities: ::Selenium::WebDriver::Remote::Capabilities.ie('requireWindowFocus': true)
+    desired_capabilities: ::Selenium::WebDriver::Remote::Capabilities.ie,
+    options: options
   )
 end
 
@@ -18,6 +21,8 @@ module TestSessions
   SeleniumIE = Capybara::Session.new(:selenium_ie, TestApp)
 end
 
+TestSessions::SeleniumIE.current_window.resize_to(800, 500)
+
 skipped_tests = %i[response_headers status_code trigger modals hover form_attribute windows]
 
 $stdout.puts `#{Selenium::WebDriver::IE.driver_path} --version` if ENV['CI']
@@ -27,18 +32,50 @@ TestSessions::SeleniumIE.current_window.resize_to(1600, 1200)
 Capybara::SpecHelper.run_specs TestSessions::SeleniumIE, 'selenium', capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
   when /#refresh it reposts$/
-    skip 'Firefox and Edge insist on prompting without providing a way to suppress'
+    skip 'IE insists on prompting without providing a way to suppress'
   when /#click_link can download a file$/
     skip 'Not sure how to configure IE for automatic downloading'
   when /#fill_in with Date /
     pending "IE 11 doesn't support date input types"
   when /#click_link_or_button with :disabled option happily clicks on links which incorrectly have the disabled attribute$/
-    pending 'IE 11 obeys non-standard disabled attribute on anchor tag'
+    skip 'IE 11 obeys non-standard disabled attribute on anchor tag'
+  when /#right_click should allow modifiers$/
+    skip "Windows can't :meta click because :meta triggers start menu"
+  when /#click should allow multiple modifiers$/
+    skip "Windows can't :meta click because :meta triggers start menu"
+  when /#double_click should allow multiple modifiers$/
+    skip "Windows can't :alt double click due to being properties shortcut"
+  when /via clicking the wrapping label if possible$/
+    pending 'IEDriver has an issue with the click location of elements with multiple children if the first child is a text node and the page is scrolled'
   end
 end
 
-RSpec.describe 'Capybara::Session with Internet Explorer', capybara_skip: skipped_tests do
+RSpec.describe 'Capybara::Session with Internet Explorer', capybara_skip: skipped_tests do # rubocop:disable RSpec/MultipleDescribes
   include Capybara::SpecHelper
   include_examples 'Capybara::Session', TestSessions::SeleniumIE, :selenium_ie
   include_examples Capybara::RSpecMatchers, TestSessions::SeleniumIE, :selenium_ie
 end
+
+RSpec.describe Capybara::Selenium::Node do
+  it '#right_click should allow modifiers' do
+    session = TestSessions::SeleniumIE
+    session.visit('/with_js')
+    session.find(:css, '#click-test').right_click(:control)
+    expect(session).to have_link('Has been control right clicked')
+  end
+
+  it '#click should allow multiple modifiers' do
+    session = TestSessions::SeleniumIE
+    session.visit('with_js')
+    # IE triggers system behavior with :meta so can't use those here
+    session.find(:css, '#click-test').click(:ctrl, :shift, :alt)
+    expect(session).to have_link('Has been alt control shift clicked')
+  end
+
+  it '#double_click should allow modifiers' do
+    session = TestSessions::SeleniumIE
+    session.visit('/with_js')
+    session.find(:css, '#click-test').double_click(:shift)
+    expect(session).to have_link('Has been shift double clicked')
+  end
+end

data/spec/selenium_spec_marionette.rb

@@ -54,10 +54,8 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumMarionette, 'selenium', cap
     pending "Firefox doesn't generate an event for shift+control+click" if marionette_gte?(62, @session)
   when /^Capybara::Session selenium node #double_click/
     pending "selenium-webdriver/geckodriver doesn't generate double click event" if marionette_lt?(59, @session)
-  when 'Capybara::Session selenium #refresh it reposts'
-    skip 'Firefox insists on prompting without providing a way to suppress'
   when 'Capybara::Session selenium #accept_prompt should accept the prompt with a blank response when there is a default'
-    pending "Geckodriver doesn't set a blank response currently"
+    pending "Geckodriver doesn't set a blank response in FF < 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1486485" if marionette_lt?(63, @session)
   when 'Capybara::Session selenium #attach_file with multipart form should fire change once for each set of files uploaded'
     pending 'Gekcodriver appends files so we have to first call clear for multiple files which creates an extra change ' \
             'if files are already set'
@@ -145,28 +143,6 @@ RSpec.describe Capybara::Selenium::Driver do
       end
     end
   end
-
-  context '#refresh' do
-    def extract_results(session)
-      expect(session).to have_xpath("//pre[@id='results']")
-      YAML.load Nokogiri::HTML(session.body).xpath("//pre[@id='results']").first.inner_html.lstrip
-    end
-
-    it 'can repost by accepting confirm' do
-      @session = TestSessions::SeleniumMarionette
-      @session.visit('/form')
-      @session.select('Sweden', from: 'form_region')
-      @session.click_button('awesome')
-      sleep 1
-      expect do
-        @session.accept_confirm(wait: 0.1) do
-          @session.refresh
-          sleep 2
-        end
-        sleep 1
-      end.to change { extract_results(@session)['post_count'] }.by(1)
-    end
-  end
 end
 
 RSpec.describe Capybara::Selenium::Node do

data/spec/shared_selenium_session.rb

@@ -305,7 +305,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
         expect(session).not_to have_xpath('//div[contains(., "HTML5 Dropped drag_html5")]')
       end
 
-      it 'should HTML6 drag and drop when scrolling needed' do
+      it 'should HTML5 drag and drop when scrolling needed' do
         pending "Firefox < 62 doesn't support a DataTransfer constuctor" if marionette_lt?(62.0, session)
         session.visit('/with_js')
         element = session.find('//div[@id="drag_html5_scroll"]')
@@ -323,26 +323,84 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       end
     end
 
-    context 'AnimationDisabler' do
-      before(:context) do # rubocop:disable RSpec/BeforeAfterAll
-        Capybara.disable_animation = true
-        @animation_session = Capybara::Session.new(session.mode, TestApp.new)
-      end
+    describe 'Capybara#disable_animation' do
+      context 'when set to `true`' do
+        before(:context) do # rubocop:disable RSpec/BeforeAfterAll
+          # NOTE: Although Capybara.SpecHelper.reset! sets Capybara.disable_animation to false,
+          # it doesn't affect any of these tests because the settings are applied per-session
+          Capybara.disable_animation = true
+          @animation_session = Capybara::Session.new(session.mode, TestApp.new)
+        end
+
+        after(:context) do # rubocop:disable RSpec/BeforeAfterAll
+          @animation_session = nil
+        end
+
+        it 'should disable CSS transitions' do
+          @animation_session.visit('with_animation')
+          @animation_session.click_link('transition me away')
+          expect(@animation_session).to have_no_link('transition me away', wait: 0.5)
+        end
 
-      after(:context) do # rubocop:disable RSpec/BeforeAfterAll
-        Capybara.disable_animation = false
+        it 'should disable CSS animations' do
+          @animation_session.visit('with_animation')
+          @animation_session.click_link('animate me away')
+          expect(@animation_session).to have_no_link('animate me away', wait: 0.5)
+        end
       end
 
-      it 'should disable CSS transitions' do
-        @animation_session.visit('with_animation')
-        @animation_session.click_link('transition me away')
-        expect(@animation_session).to have_no_link('transition me away', wait: 0.5)
+      context 'if we pass in css that matches elements' do
+        before(:context) do # rubocop:disable RSpec/BeforeAfterAll
+          # NOTE: Although Capybara.SpecHelper.reset! sets Capybara.disable_animation to false,
+          # it doesn't affect any of these tests because the settings are applied per-session
+          Capybara.disable_animation = '#with_animation a'
+          @animation_session_with_matching_css = Capybara::Session.new(session.mode, TestApp.new)
+        end
+
+        after(:context) do # rubocop:disable RSpec/BeforeAfterAll
+          @animation_session_with_matching_css = nil
+        end
+
+        it 'should disable CSS transitions' do
+          @animation_session_with_matching_css.visit('with_animation')
+          @animation_session_with_matching_css.click_link('transition me away')
+          expect(@animation_session_with_matching_css).to have_no_link('transition me away', wait: 0.5)
+        end
+
+        it 'should disable CSS animations' do
+          @animation_session_with_matching_css.visit('with_animation')
+          @animation_session_with_matching_css.click_link('animate me away')
+          expect(@animation_session_with_matching_css).to have_no_link('animate me away', wait: 0.5)
+        end
       end
 
-      it 'should disable CSS animations' do
-        @animation_session.visit('with_animation')
-        @animation_session.click_link('animate me away')
-        expect(@animation_session).to have_no_link('animate me away', wait: 0.5)
+      context 'if we pass in css that does not match elements' do
+        before(:context) do # rubocop:disable RSpec/BeforeAfterAll
+          # NOTE: Although Capybara.SpecHelper.reset! sets Capybara.disable_animation to false,
+          # it doesn't affect any of these tests because the settings are applied per-session
+          Capybara.disable_animation = '.this-class-matches-nothing'
+          @animation_session_without_matching_css = Capybara::Session.new(session.mode, TestApp.new)
+        end
+
+        after(:context) do # rubocop:disable RSpec/BeforeAfterAll
+          @animation_session_without_matching_css = nil
+        end
+
+        it 'should not disable CSS transitions' do
+          @animation_session_without_matching_css.visit('with_animation')
+          @animation_session_without_matching_css.click_link('transition me away')
+          sleep 0.5 # Wait long enough for click to have been processed
+          expect(@animation_session_without_matching_css).to have_link('transition me away', wait: false)
+          expect(@animation_session_without_matching_css).to have_no_link('transition me away', wait: 5)
+        end
+
+        it 'should not disable CSS animations' do
+          @animation_session_without_matching_css.visit('with_animation')
+          @animation_session_without_matching_css.click_link('animate me away')
+          sleep 0.5 # Wait long enough for click to have been processed
+          expect(@animation_session_without_matching_css).to have_link('animate me away', wait: false)
+          expect(@animation_session_without_matching_css).to have_no_link('animate me away', wait: 5)
+        end
       end
     end
   end