capybara 3.14.0 → 3.15.0

data/spec/rspec/features_spec.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 require 'capybara/rspec'
 
+# rubocop:disable RSpec/InstanceVariable
 RSpec.configuration.before(:each, file_path: './spec/rspec/features_spec.rb') do
   @in_filtered_hook = true
 end
@@ -53,6 +54,7 @@ feature "Capybara's feature DSL" do
     end
   end
 end
+# rubocop:enable RSpec/InstanceVariable
 
 feature 'given and given! aliases to let and let!' do
   given(:value) { :available }

data/spec/rspec/shared_spec_matchers.rb

@@ -555,21 +555,20 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
       context 'with wait' do
         before do
-          @session = session
-          @session.visit('/with_js')
+          session.visit('/with_js')
         end
 
         it 'waits if wait time is more than timeout' do
-          @session.click_link('Change title')
+          session.click_link('Change title')
           using_wait_time 0 do
-            expect(@session).to have_title('changed title', wait: 2)
+            expect(session).to have_title('changed title', wait: 2)
           end
         end
 
         it "doesn't wait if wait time is less than timeout" do
-          @session.click_link('Change title')
+          session.click_link('Change title')
           using_wait_time 3 do
-            expect(@session).not_to have_title('changed title', wait: 0)
+            expect(session).not_to have_title('changed title', wait: 0)
           end
         end
       end
@@ -600,21 +599,20 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
       context 'with wait' do
         before do
-          @session = session
-          @session.visit('/with_js')
+          session.visit('/with_js')
         end
 
         it 'waits if wait time is more than timeout' do
-          @session.click_link('Change page')
+          session.click_link('Change page')
           using_wait_time 0 do
-            expect(@session).to have_current_path('/with_html', wait: 2)
+            expect(session).to have_current_path('/with_html', wait: 2)
           end
         end
 
         it "doesn't wait if wait time is less than timeout" do
-          @session.click_link('Change page')
+          session.click_link('Change page')
           using_wait_time 0 do
-            expect(@session).not_to have_current_path('/with_html')
+            expect(session).not_to have_current_path('/with_html')
           end
         end
       end
@@ -848,10 +846,11 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
   end
 
   context 'compounding timing' do
+    let(:session) { session }
+    let(:el) { session.find(:css, '#reload-me') }
+
     before do
-      @session = session
-      @session.visit('/with_js')
-      @el = @session.find(:css, '#reload-me')
+      session.visit('/with_js')
     end
 
     context '#and' do
@@ -860,82 +859,82 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
           matcher = have_text('this is not there').and have_text('neither is this')
           expect(Benchmark.realtime do
             expect do
-              expect(@el).to matcher
+              expect(el).to matcher
             end.to raise_error RSpec::Expectations::ExpectationNotMetError
           end).to be_between(2, 3)
         end
       end
 
       it "should run 'concurrently' and retry" do
-        @session.click_link('reload-link')
-        @session.using_wait_time(2) do
+        session.click_link('reload-link')
+        session.using_wait_time(2) do
           expect(Benchmark.realtime do
             expect do
-              expect(@el).to have_text('waiting to be reloaded').and(have_text('has been reloaded'))
+              expect(el).to have_text('waiting to be reloaded').and(have_text('has been reloaded'))
             end.to raise_error RSpec::Expectations::ExpectationNotMetError, /expected to find text "waiting to be reloaded" in "has been reloaded"/
           end).to be_between(2, 3)
         end
       end
 
       it 'should ignore :wait options' do
-        @session.using_wait_time(2) do
+        session.using_wait_time(2) do
           matcher = have_text('this is not there', wait: 5).and have_text('neither is this', wait: 6)
           expect(Benchmark.realtime do
             expect do
-              expect(@el).to matcher
+              expect(el).to matcher
             end.to raise_error RSpec::Expectations::ExpectationNotMetError
           end).to be_between(2, 3)
         end
       end
 
       it 'should work on the session' do
-        @session.using_wait_time(2) do
-          @session.click_link('reload-link')
-          expect(@session).to have_selector(:css, 'h1', text: 'FooBar').and have_text('has been reloaded')
+        session.using_wait_time(2) do
+          session.click_link('reload-link')
+          expect(session).to have_selector(:css, 'h1', text: 'FooBar').and have_text('has been reloaded')
         end
       end
     end
 
     context '#and_then' do
       it 'should run sequentially' do
-        @session.click_link('reload-link')
-        expect(@el).to have_text('waiting to be reloaded').and_then have_text('has been reloaded')
+        session.click_link('reload-link')
+        expect(el).to have_text('waiting to be reloaded').and_then have_text('has been reloaded')
       end
     end
 
     context '#or' do
       it "should run 'concurrently'" do
-        @session.using_wait_time(3) do
+        session.using_wait_time(3) do
           expect(Benchmark.realtime do
-            expect(@el).to have_text('has been reloaded').or have_text('waiting to be reloaded')
+            expect(el).to have_text('has been reloaded').or have_text('waiting to be reloaded')
           end).to be < 1
         end
       end
 
       it 'should retry' do
-        @session.using_wait_time(3) do
+        session.using_wait_time(3) do
           expect(Benchmark.realtime do
             expect do
-              expect(@el).to have_text('has been reloaded').or have_text('random stuff')
+              expect(el).to have_text('has been reloaded').or have_text('random stuff')
             end.to raise_error RSpec::Expectations::ExpectationNotMetError
           end).to be > 3
         end
       end
 
       it 'should ignore :wait options' do
-        @session.using_wait_time(2) do
+        session.using_wait_time(2) do
           expect(Benchmark.realtime do
             expect do
-              expect(@el).to have_text('this is not there', wait: 10).or have_text('neither is this', wait: 15)
+              expect(el).to have_text('this is not there', wait: 10).or have_text('neither is this', wait: 15)
             end.to raise_error RSpec::Expectations::ExpectationNotMetError
           end).to be_between(2, 3)
         end
       end
 
       it 'should work on the session' do
-        @session.using_wait_time(2) do
-          @session.click_link('reload-link')
-          expect(@session).to have_selector(:css, 'h1', text: 'Not on the page').or have_text('has been reloaded')
+        session.using_wait_time(2) do
+          session.click_link('reload-link')
+          expect(session).to have_selector(:css, 'h1', text: 'Not on the page').or have_text('has been reloaded')
         end
       end
     end

data/spec/rspec_spec.rb

@@ -75,40 +75,38 @@ RSpec.describe 'capybara/rspec' do
 
   context 'Type: Other', type: :other do
     context 'when RSpec::Matchers is included after Capybara::DSL' do
-      before do
+      let(:test_class_instance) do
         class DSLMatchersTest
           include Capybara::DSL
           include RSpec::Matchers
-        end
-
-        @test_class_instance = DSLMatchersTest.new
+        end.new
       end
 
       context '#all' do
         it 'allows access to the Capybara finder' do
-          @test_class_instance.visit('/with_html')
-          expect(@test_class_instance.all(:css, 'h2.head').size).to eq(5)
+          test_class_instance.visit('/with_html')
+          expect(test_class_instance.all(:css, 'h2.head').size).to eq(5)
         end
 
         it 'allows access to the RSpec matcher' do
-          @test_class_instance.visit('/with_html')
+          test_class_instance.visit('/with_html')
           strings = %w[test1 test2]
-          expect(strings).to @test_class_instance.all(be_a(String))
+          expect(strings).to test_class_instance.all(be_a(String))
         end
       end
 
       context '#within' do
         it 'allows access to the Capybara scoper' do
-          @test_class_instance.visit('/with_html')
+          test_class_instance.visit('/with_html')
           expect do
-            @test_class_instance.within(:css, '#does_not_exist') { @test_class_instance.click_link 'Go to simple' }
+            test_class_instance.within(:css, '#does_not_exist') { test_class_instance.click_link 'Go to simple' }
           end.to raise_error(Capybara::ElementNotFound)
         end
 
         it 'allows access to the RSpec matcher' do
-          @test_class_instance.visit('/with_html')
+          test_class_instance.visit('/with_html')
           # This reads terribly, but must call #within
-          expect(@test_class_instance.find(:css, 'span.number').text.to_i).to @test_class_instance.within(1).of(41)
+          expect(test_class_instance.find(:css, 'span.number').text.to_i).to test_class_instance.within(1).of(41)
         end
       end
 
@@ -124,7 +122,7 @@ RSpec.describe 'capybara/rspec' do
         it 'can be called with `not_to`' do
           # This test is for a bug in jruby where `super` isn't defined correctly - https://github.com/jruby/jruby/issues/4678
           # Reported in https://github.com/teamcapybara/capybara/issues/2115
-          @test_class_instance.instance_eval do
+          test_class_instance.instance_eval do
             expect do
               expect(true).not_to only_match_matcher(false) # rubocop:disable RSpec/ExpectActual
             end.not_to raise_error

data/spec/selector_spec.rb

@@ -42,6 +42,27 @@ 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
@@ -467,6 +488,16 @@ RSpec.describe Capybara do
           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
   end
 end

data/spec/selenium_spec_chrome.rb

@@ -50,23 +50,23 @@ RSpec.describe 'Capybara::Session with chrome' do
   context 'storage' do
     describe '#reset!' do
       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
+        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
+        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
     end
   end
@@ -79,29 +79,29 @@ RSpec.describe 'Capybara::Session with chrome' do
 
   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
 end

data/spec/selenium_spec_firefox.rb

@@ -64,6 +64,8 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capyba
     skip 'Need to figure out testing of file downloading on windows platform' if Gem.win_platform?
   when 'Capybara::Session selenium #reset_session! removes ALL cookies'
     pending "Geckodriver doesn't provide a way to remove cookies outside the current domain"
+  when 'Capybara::Session selenium #attach_file with a block can upload by clicking the file input'
+    pending "Geckodriver doesn't allow clicking on file inputs"
   end
 end
 
@@ -71,54 +73,79 @@ RSpec.describe 'Capybara::Session with firefox' do # rubocop:disable RSpec/Multi
   include Capybara::SpecHelper
   include_examples  'Capybara::Session', TestSessions::SeleniumFirefox, :selenium_firefox
   include_examples  Capybara::RSpecMatchers, TestSessions::SeleniumFirefox, :selenium_firefox
+
+  describe 'filling in Firefox-specific date and time fields with keystrokes' do
+    let(:datetime) { Time.new(1983, 6, 19, 6, 30) }
+    let(:session) { TestSessions::SeleniumFirefox }
+
+    before do
+      session.visit('/form')
+    end
+
+    it 'should fill in a date input with a String' do
+      session.fill_in('form_date', with: datetime.to_date.iso8601)
+      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: datetime.to_time.strftime('%T'))
+      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
+      # FF doesn't currently support datetime-local so this is really just a text input
+      session.fill_in('form_datetime', with: datetime.iso8601)
+      session.click_button('awesome')
+      expect(Time.parse(extract_results(session)['datetime'])).to eq datetime
+    end
+  end
 end
 
 RSpec.describe Capybara::Selenium::Driver do
-  before do
-    @driver = Capybara::Selenium::Driver.new(TestApp, browser: :firefox, options: browser_options)
-  end
+  let(:driver) { Capybara::Selenium::Driver.new(TestApp, browser: :firefox, options: browser_options) }
 
   describe '#quit' do
     it 'should reset browser when quit' do
-      expect(@driver.browser).to be_truthy
-      @driver.quit
+      expect(driver.browser).to be_truthy
+      driver.quit
       # access instance variable directly so we don't create a new browser instance
-      expect(@driver.instance_variable_get(:@browser)).to be_nil
+      expect(driver.instance_variable_get(:@browser)).to be_nil
     end
 
     context 'with errors' do
-      before do
-        @original_browser = @driver.browser
-      end
+      let!(:original_browser) { driver.browser }
 
       after do
         # Ensure browser is actually quit so we don't leave hanging processe
-        RSpec::Mocks.space.proxy_for(@original_browser).reset
-        @original_browser.quit
+        RSpec::Mocks.space.proxy_for(original_browser).reset
+        original_browser.quit
       end
 
       it 'warns UnknownError returned during quit because the browser is probably already gone' do
-        allow(@driver).to receive(:warn)
-        allow(@driver.browser).to(
+        allow(driver).to receive(:warn)
+        allow(driver.browser).to(
           receive(:quit)
           .and_raise(Selenium::WebDriver::Error::UnknownError, 'random message')
         )
 
-        expect { @driver.quit }.not_to raise_error
-        expect(@driver.instance_variable_get(:@browser)).to be_nil
-        expect(@driver).to have_received(:warn).with(/random message/)
+        expect { driver.quit }.not_to raise_error
+        expect(driver.instance_variable_get(:@browser)).to be_nil
+        expect(driver).to have_received(:warn).with(/random message/)
       end
 
       it 'ignores silenced UnknownError returned during quit because the browser is almost definitely already gone' do
-        allow(@driver).to receive(:warn)
-        allow(@driver.browser).to(
+        allow(driver).to receive(:warn)
+        allow(driver.browser).to(
           receive(:quit)
           .and_raise(Selenium::WebDriver::Error::UnknownError, 'Error communicating with the remote browser')
         )
 
-        expect { @driver.quit }.not_to raise_error
-        expect(@driver.instance_variable_get(:@browser)).to be_nil
-        expect(@driver).not_to have_received(:warn)
+        expect { driver.quit }.not_to raise_error
+        expect(driver.instance_variable_get(:@browser)).to be_nil
+        expect(driver).not_to have_received(:warn)
       end
     end
   end
@@ -126,23 +153,23 @@ RSpec.describe Capybara::Selenium::Driver do
   context 'storage' do
     describe '#reset!' do
       it 'clears storage by default' do
-        @session = TestSessions::SeleniumFirefox
-        @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
+        session = TestSessions::SeleniumFirefox
+        session.visit('/with_js')
+        session.find(:css, '#set-storage').click
+        session.reset!
+        session.visit('/with_js')
+        expect(session.driver.browser.local_storage.keys).to be_empty
+        expect(session.driver.browser.session_storage.keys).to be_empty
       end
 
       it 'does not clear storage when false' do
-        @session = Capybara::Session.new(:selenium_firefox_not_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).not_to be_empty
-        expect(@session.driver.browser.session_storage.keys).not_to be_empty
+        session = Capybara::Session.new(:selenium_firefox_not_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).not_to be_empty
+        expect(session.driver.browser.session_storage.keys).not_to be_empty
       end
     end
   end