capybara 3.3.1 → 3.4.0

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

@@ -18,7 +18,7 @@ Capybara::SpecHelper.spec '#current_window', requires: [:windows] do
     expect(@session.current_window).to be_instance_of(Capybara::Window)
   end
 
-  it "should be modified by switching to another window" do
+  it 'should be modified by switching to another window' do
     window = @session.window_opened_by { @session.find(:css, '#openWindow').click }
 
     expect do

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

@@ -15,27 +15,27 @@ Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
     @session.switch_to_window(@window)
   end
 
-  it "should raise error when invoked without args" do
+  it 'should raise error when invoked without args' do
     expect do
       @session.switch_to_window
-    end.to raise_error(ArgumentError, "`switch_to_window`: either window or block should be provided")
+    end.to raise_error(ArgumentError, '`switch_to_window`: either window or block should be provided')
   end
 
-  it "should raise error when invoked with window and block" do
+  it 'should raise error when invoked with window and block' do
     expect do
       @session.switch_to_window(@window) { @session.title == 'Title of the first popup' }
-    end.to raise_error(ArgumentError, "`switch_to_window` can take either a block or a window, not both")
+    end.to raise_error(ArgumentError, '`switch_to_window` can take either a block or a window, not both')
   end
 
-  context "with an instance of Capybara::Window" do
-    it "should be able to switch to window" do
+  context 'with an instance of Capybara::Window' do
+    it 'should be able to switch to window' do
       window = @session.open_new_window
       expect(@session.title).to eq('With Windows')
       @session.switch_to_window(window)
       expect(@session.title).to satisfy('be a blank title') { |title| ['', 'about:blank'].include? title }
     end
 
-    it "should raise error when closed window is passed" do
+    it 'should raise error when closed window is passed' do
       original_window = @session.current_window
       new_window = @session.open_new_window
       @session.switch_to_window(new_window)
@@ -47,30 +47,30 @@ Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
     end
   end
 
-  context "with block" do
+  context 'with block' do
     before do
       @session.find(:css, '#openTwoWindows').click
       sleep(1) # wait for the windows to open
     end
 
-    it "should be able to switch to current window" do
+    it 'should be able to switch to current window' do
       @session.switch_to_window { @session.title == 'With Windows' }
       expect(@session).to have_css('#openTwoWindows')
     end
 
-    it "should find the div in another window" do
+    it 'should find the div in another window' do
       @session.switch_to_window { @session.title == 'Title of popup two' }
       expect(@session).to have_css('#divInPopupTwo')
     end
 
-    it "should be able to switch multiple times" do
+    it 'should be able to switch multiple times' do
       @session.switch_to_window { @session.title == 'Title of the first popup' }
       expect(@session).to have_css('#divInPopupOne')
       @session.switch_to_window { @session.title == 'Title of popup two' }
       expect(@session).to have_css('#divInPopupTwo')
     end
 
-    it "should return window" do
+    it 'should return window' do
       window = @session.switch_to_window { @session.title == 'Title of popup two' }
       expect((@session.windows - [@window])).to include(window)
     end
@@ -91,7 +91,7 @@ Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
       end.to raise_error(Capybara::ScopeError, /`switch_to_window` is not supposed to be invoked from/)
     end
 
-    it "should allow to be called inside within_window and within_window will still return to original" do
+    it 'should allow to be called inside within_window and within_window will still return to original' do
       other_windows = (@session.windows - [@window])
       expect(@session.current_window).to eq(@window)
       @session.within_window other_windows[0] do
@@ -106,11 +106,11 @@ Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
       original = @session.current_window
       expect do
         @session.switch_to_window { @session.title == 'A title' }
-      end.to raise_error(Capybara::WindowError, "Could not find a window matching block/lambda")
+      end.to raise_error(Capybara::WindowError, 'Could not find a window matching block/lambda')
       expect(@session.current_window).to eq(original)
     end
 
-    it "should switch to original window if error is raised inside block" do
+    it 'should switch to original window if error is raised inside block' do
       original = @session.switch_to_window(@session.windows[1])
       expect do
         @session.switch_to_window { raise 'error' }
@@ -119,7 +119,7 @@ Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
     end
   end
 
-  it "should wait for window to appear" do
+  it 'should wait for window to appear' do
     @session.find(:css, '#openWindowWithTimeout').click
     expect do
       @session.switch_to_window(wait: 5) { @session.title == 'Title of the first popup' }

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

@@ -15,8 +15,8 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
     @session.switch_to_window(@window)
   end
 
-  let(:zero_windows_message) { "block passed to #window_opened_by opened 0 windows instead of 1" }
-  let(:two_windows_message) { "block passed to #window_opened_by opened 2 windows instead of 1" }
+  let(:zero_windows_message) { 'block passed to #window_opened_by opened 0 windows instead of 1' }
+  let(:two_windows_message) { 'block passed to #window_opened_by opened 2 windows instead of 1' }
 
   context 'with :wait option' do
     it 'should raise error if value of :wait is less than timeout' do

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

@@ -21,7 +21,7 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
       end
     end
 
-    it "should become false after window was closed" do
+    it 'should become false after window was closed' do
       expect do
         @session.switch_to_window @other_window
         @other_window.close
@@ -30,7 +30,7 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   end
 
   describe '#closed?' do
-    it "should become true after window was closed" do
+    it 'should become true after window was closed' do
       @other_window = @session.window_opened_by do
         @session.find(:css, '#openWindow').click
       end
@@ -89,7 +89,7 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
 
   describe '#size' do
     def win_size
-      @session.evaluate_script("[window.outerWidth || window.innerWidth, window.outerHeight || window.innerHeight]")
+      @session.evaluate_script('[window.outerWidth || window.innerWidth, window.outerHeight || window.innerHeight]')
     end
 
     it 'should return size of whole window', requires: %i[windows js] do
@@ -195,7 +195,7 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
       sleep 0.5
     end
 
-    it "should be able to fullscreen the window" do
+    it 'should be able to fullscreen the window' do
       expect do
         @session.current_window.fullscreen
       end.not_to raise_error

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

@@ -19,8 +19,8 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
     @session.switch_to_window(@window)
   end
 
-  context "with an instance of Capybara::Window" do
-    it "should not invoke driver#switch_to_window when given current window" do
+  context 'with an instance of Capybara::Window' do
+    it 'should not invoke driver#switch_to_window when given current window' do
       allow(@session.driver).to receive(:switch_to_window).and_call_original
       @session.within_window @window do
         expect(@session.title).to eq('With Windows')
@@ -28,7 +28,7 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
       expect(@session.driver).not_to have_received(:switch_to_window)
     end
 
-    it "should be able to switch to another window" do
+    it 'should be able to switch to another window' do
       window = (@session.windows - [@window]).first
       @session.within_window window do
         expect(@session).to have_title(/Title of the first popup|Title of popup two/)
@@ -36,7 +36,7 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
       expect(@session.title).to eq('With Windows')
     end
 
-    it "returns value from the block" do
+    it 'returns value from the block' do
       window = (@session.windows - [@window]).first
       value = @session.within_window window do
         43252003274489856000
@@ -44,7 +44,7 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
       expect(value).to eq(43252003274489856000)
     end
 
-    it "should switch back if exception was raised inside block" do
+    it 'should switch back if exception was raised inside block' do
       window = (@session.windows - [@window]).first
       expect do
         @session.within_window(window) do
@@ -58,7 +58,7 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
       expect(@session.send(:scopes)).to eq([nil])
     end
 
-    it "should leave correct scopes after execution in case of error", requires: %i[windows frames] do
+    it 'should leave correct scopes after execution in case of error', requires: %i[windows frames] do
       window = (@session.windows - [@window]).first
       expect do
         @session.within_frame 'frameOne' do
@@ -86,14 +86,14 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
     end
   end
 
-  context "with lambda" do
-    it "should find the div in another window" do
+  context 'with lambda' do
+    it 'should find the div in another window' do
       @session.within_window(-> { @session.title == 'Title of the first popup' }) do
         expect(@session).to have_css('#divInPopupOne')
       end
     end
 
-    it "should find divs in both windows" do
+    it 'should find divs in both windows' do
       @session.within_window(-> { @session.title == 'Title of popup two' }) do
         expect(@session).to have_css('#divInPopupTwo')
       end
@@ -103,7 +103,7 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
       expect(@session.title).to eq('With Windows')
     end
 
-    it "should be able to nest within_window" do
+    it 'should be able to nest within_window' do
       @session.within_window(-> { @session.title == 'Title of popup two' }) do
         expect(@session).to have_css('#divInPopupTwo')
         @session.within_window(-> { @session.title == 'Title of the first popup' }) do
@@ -117,7 +117,7 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
       expect(@session.title).to eq('With Windows')
     end
 
-    it "should work inside a normal scope" do
+    it 'should work inside a normal scope' do
       expect(@session).to have_css('#openWindow')
       @session.within(:css, '#scope') do
         @session.within_window(-> { @session.title == 'Title of the first popup' }) do
@@ -133,18 +133,18 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
         @session.within_window(-> { @session.title == 'Invalid title' }) do
           expect(@session).to have_css('#divInPopupOne')
         end
-      end.to raise_error(Capybara::WindowError, "Could not find a window matching block/lambda")
+      end.to raise_error(Capybara::WindowError, 'Could not find a window matching block/lambda')
       expect(@session.current_window).to eq(@window)
       expect(@session).to have_css('#doesNotOpenWindows')
       expect(@session.send(:scopes)).to eq([nil])
     end
 
-    it "returns value from the block" do
+    it 'returns value from the block' do
       value = @session.within_window(-> { @session.title == 'Title of popup two' }) { 42 }
       expect(value).to eq(42)
     end
 
-    it "should switch back if exception was raised inside block" do
+    it 'should switch back if exception was raised inside block' do
       expect do
         @session.within_window(-> { @session.title == 'Title of popup two' }) do
           raise 'some error'

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

@@ -5,31 +5,31 @@ Capybara::SpecHelper.spec '#within' do
     @session.visit('/with_scope')
   end
 
-  context "with CSS selector" do
-    it "should click links in the given scope" do
-      @session.within(:css, "#for_bar li:first-child") do
+  context 'with CSS selector' do
+    it 'should click links in the given scope' do
+      @session.within(:css, '#for_bar li:first-child') do
         @session.click_link('Go')
       end
       expect(@session).to have_content('Bar')
     end
 
-    it "should assert content in the given scope" do
-      @session.within(:css, "#for_foo") do
+    it 'should assert content in the given scope' do
+      @session.within(:css, '#for_foo') do
         expect(@session).not_to have_content('First Name')
       end
       expect(@session).to have_content('First Name')
     end
 
-    it "should accept additional options" do
-      @session.within(:css, "#for_bar li", text: 'With Simple HTML') do
+    it 'should accept additional options' do
+      @session.within(:css, '#for_bar li', text: 'With Simple HTML') do
         @session.click_link('Go')
       end
       expect(@session).to have_content('Bar')
     end
   end
 
-  context "with XPath selector" do
-    it "should click links in the given scope" do
+  context 'with XPath selector' do
+    it 'should click links in the given scope' do
       @session.within(:xpath, "//div[@id='for_bar']//li[contains(.,'With Simple HTML')]") do
         @session.click_link('Go')
       end
@@ -37,8 +37,8 @@ Capybara::SpecHelper.spec '#within' do
     end
   end
 
-  context "with the default selector" do
-    it "should use XPath" do
+  context 'with the default selector' do
+    it 'should use XPath' do
       @session.within("//div[@id='for_bar']//li[contains(.,'With Simple HTML')]") do
         @session.click_link('Go')
       end
@@ -46,9 +46,9 @@ Capybara::SpecHelper.spec '#within' do
     end
   end
 
-  context "with Node rather than selector" do
-    it "should click links in the given scope" do
-      node_of_interest = @session.find(:css, "#for_bar li", text: 'With Simple HTML')
+  context 'with Node rather than selector' do
+    it 'should click links in the given scope' do
+      node_of_interest = @session.find(:css, '#for_bar li', text: 'With Simple HTML')
 
       @session.within(node_of_interest) do
         @session.click_link('Go')
@@ -57,11 +57,11 @@ Capybara::SpecHelper.spec '#within' do
     end
   end
 
-  context "with the default selector set to CSS" do
+  context 'with the default selector set to CSS' do
     before { Capybara.default_selector = :css }
 
-    it "should use CSS" do
-      @session.within("#for_bar li", text: 'With Simple HTML') do
+    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')
@@ -69,8 +69,8 @@ Capybara::SpecHelper.spec '#within' do
     after { Capybara.default_selector = :xpath }
   end
 
-  context "with nested scopes" do
-    it "should respect the inner scope" do
+  context 'with nested scopes' do
+    it 'should respect the inner scope' do
       @session.within("//div[@id='for_bar']") do
         @session.within(".//li[contains(.,'Bar')]") do
           @session.click_link('Go')
@@ -79,7 +79,7 @@ Capybara::SpecHelper.spec '#within' do
       expect(@session).to have_content('Another World')
     end
 
-    it "should respect the outer scope" do
+    it 'should respect the outer scope' do
       @session.within("//div[@id='another_foo']") do
         @session.within(".//li[contains(.,'With Simple HTML')]") do
           @session.click_link('Go')
@@ -89,14 +89,14 @@ Capybara::SpecHelper.spec '#within' do
     end
   end
 
-  it "should raise an error if the scope is not found on the page" do
+  it 'should raise an error if the scope is not found on the page' do
     expect do
       @session.within("//div[@id='doesnotexist']") do
       end
     end.to raise_error(Capybara::ElementNotFound)
   end
 
-  it "should restore the scope when an error is raised" do
+  it 'should restore the scope when an error is raised' do
     expect do
       @session.within("//div[@id='for_bar']") do
         expect do
@@ -109,7 +109,7 @@ Capybara::SpecHelper.spec '#within' do
     end.not_to change { @session.has_xpath?(".//div[@id='another_foo']") }.from(true)
   end
 
-  it "should fill in a field and click a button" do
+  it 'should fill in a field and click a button' do
     @session.within("//li[contains(.,'Bar')]") do
       @session.click_button('Go')
     end
@@ -122,9 +122,9 @@ Capybara::SpecHelper.spec '#within' do
     expect(extract_results(@session)['first_name']).to eq('Dagobert')
   end
 
-  it "should have #within_element as an alias" do
+  it 'should have #within_element as an alias' do
     expect(Capybara::Session.instance_method(:within)).to eq Capybara::Session.instance_method(:within_element)
-    @session.within_element(:css, "#for_foo") do
+    @session.within_element(:css, '#for_foo') do
       expect(@session).not_to have_content('First Name')
     end
   end
@@ -135,18 +135,18 @@ Capybara::SpecHelper.spec '#within_fieldset' do
     @session.visit('/fieldsets')
   end
 
-  it "should restrict scope to a fieldset given by id" do
-    @session.within_fieldset("villain_fieldset") do
-      @session.fill_in("Name", with: 'Goldfinger')
-      @session.click_button("Create")
+  it 'should restrict scope to a fieldset given by id' do
+    @session.within_fieldset('villain_fieldset') do
+      @session.fill_in('Name', with: 'Goldfinger')
+      @session.click_button('Create')
     end
     expect(extract_results(@session)['villain_name']).to eq('Goldfinger')
   end
 
-  it "should restrict scope to a fieldset given by legend" do
-    @session.within_fieldset("Villain") do
-      @session.fill_in("Name", with: 'Goldfinger')
-      @session.click_button("Create")
+  it 'should restrict scope to a fieldset given by legend' do
+    @session.within_fieldset('Villain') do
+      @session.fill_in('Name', with: 'Goldfinger')
+      @session.click_button('Create')
     end
     expect(extract_results(@session)['villain_name']).to eq('Goldfinger')
   end
@@ -157,18 +157,18 @@ Capybara::SpecHelper.spec '#within_table' do
     @session.visit('/tables')
   end
 
-  it "should restrict scope to a fieldset given by id" do
-    @session.within_table("girl_table") do
-      @session.fill_in("Name", with: 'Christmas')
-      @session.click_button("Create")
+  it 'should restrict scope to a fieldset given by id' do
+    @session.within_table('girl_table') do
+      @session.fill_in('Name', with: 'Christmas')
+      @session.click_button('Create')
     end
     expect(extract_results(@session)['girl_name']).to eq('Christmas')
   end
 
-  it "should restrict scope to a fieldset given by legend" do
-    @session.within_table("Villain") do
-      @session.fill_in("Name", with: 'Quantum')
-      @session.click_button("Create")
+  it 'should restrict scope to a fieldset given by legend' do
+    @session.within_table('Villain') do
+      @session.fill_in('Name', with: 'Quantum')
+      @session.click_button('Create')
     end
     expect(extract_results(@session)['villain_name']).to eq('Quantum')
   end

data/lib/capybara/spec/spec_helper.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "rspec"
-require "rspec/expectations"
-require "capybara"
-require "capybara/rspec" # Required here instead of in rspec_spec to avoid RSpec deprecation warning
-require "capybara/spec/test_app"
-require "nokogiri"
+require 'rspec'
+require 'rspec/expectations'
+require 'capybara'
+require 'capybara/rspec' # Required here instead of in rspec_spec to avoid RSpec deprecation warning
+require 'capybara/spec/test_app'
+require 'nokogiri'
 
 Capybara.save_path = File.join(Dir.pwd, 'save_path_tmp')
 
@@ -33,6 +33,7 @@ module Capybara
         Capybara.enable_aria_label = false
         Capybara.default_set_options = {}
         Capybara.disable_animation = false
+        Capybara.test_id = nil
         reset_threadsafe
       end
 
@@ -51,14 +52,15 @@ module Capybara
         @specs << [name, options, block]
       end
 
-      def run_specs(session, name, **options)
+      def run_specs(session, name, **options, &filter_block)
         specs = @specs
         RSpec.describe Capybara::Session, name, options do # rubocop:disable RSpec/EmptyExampleGroup
           include Capybara::SpecHelper
           include Capybara::RSpecMatchers
           # rubocop:disable RSpec/ScatteredSetup
-          before do
+          before do |example|
             @session = session
+            instance_exec(example, &filter_block) if filter_block
           end
 
           after do
@@ -150,4 +152,4 @@ module Capybara
   end
 end
 
-Dir[File.dirname(__FILE__) + "/session/**/*.rb"].each { |file| require_relative file }
+Dir[File.dirname(__FILE__) + '/session/**/*.rb'].each { |file| require_relative file }