capybara 3.14.0 → 3.15.0

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

@@ -94,6 +94,11 @@
     <input type="file" name="form[image]" id="form_image"/>
   </p>
 
+  <p>
+    <label for="form_hidden_image">Hidden Image</label>
+    <input type="file" name="form[hidden_image]" id="form_hidden_image" style="display: none"/>
+  </p>
+
   <p>
     <input type="hidden" name="form[token]" value="12345" id="form_token"/>
   </p>

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

@@ -61,3 +61,70 @@
     </tr>
   </table>
 </form>
+
+<table>
+  <caption>Horizontal Headers</caption>
+  <thead>
+    <tr>
+      <th>First Name</th>
+      <th>Last Name</th>
+      <th>City</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Thomas</td>
+      <td>Walpole</td>
+      <td>Oceanside</td>
+    </tr>
+    <tr>
+     <td>Danilo</td>
+     <td>Wilkinson</td>
+     <td>Johnsonville</td>
+    </tr>
+    <tr>
+      <td>Vern</td>
+      <td>Konopelski</td>
+      <td>Everette</td>
+    </tr>
+    <tr>
+      <td>Ratke</td>
+      <td>Lawrence</td>
+      <td>East Sorayashire</td>
+    </tr>
+    <tr>
+      <td>Palmer</td>
+      <td>Sawayn</td>
+      <td>West Trinidad</td>
+    </tr>
+  </tbody>
+</table>
+
+<table>
+  <caption>Vertical Headers</caption>
+  <tr>
+    <th>First Name</th>
+    <td>Thomas</td>
+    <td>Danilo</td>
+    <td>Vern</td>
+    <td>Ratke</td>
+    <td>Palmer</td>
+  </tr>
+  <tr>
+    <th>Last Name</th>
+    <td>Walpole</td>
+    <td>Wilkinson</td>
+    <td>Konopelski</td>
+    <td>Lawrence</td>
+    <td>Sawayn</td>
+  </tr>
+  <tr>
+    <th>City</th>
+    <td>Oceanside</td>
+    <td>Johnsonville</td>
+    <td>Everette</td>
+    <td>East Sorayashire</td>
+    <td>West Trinidad</td>
+  </tr>
+</table>
+

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

@@ -21,9 +21,9 @@
   Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
   tempor incididunt ut <a href="/with_simple_html" title="awesome title" class="simple">labore</a>
   et dolore magna aliqua. Ut enim ad minim veniam,
-  quis nostrud exercitation <a href="/foo" id="foo">ullamco</a> laboris nisi
+  quis nostrud exercitation <a href="/foo" id="foo" data-test-id="test-foo">ullamco</a> laboris nisi
   ut aliquip ex ea commodo consequat.
-  <a href="/with_simple_html" aria-label="Go to simple"><img id="first_image" width="20" height="20" alt="awesome image" /></a>
+  <a href="/with_simple_html" aria-label="Go to simple" data-test-id="test-simple"><img id="first_image" width="20" height="20" alt="awesome image" src="data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="/></a>
 </p>
 
 <p class="para" id="second" style="display: inline;">

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

@@ -137,6 +137,7 @@
 
     <p>
       <input type="file" id="hidden_file" style="opacity:0; display: none;">
+      <label for="hidden_file">Label for hidden file input</label>
     </p>
 
     <p>

data/lib/capybara/version.rb

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

data/spec/capybara_spec.rb

@@ -4,12 +4,12 @@ require 'spec_helper'
 
 RSpec.describe Capybara do
   describe 'default_max_wait_time' do
-    after do
-      Capybara.default_max_wait_time = @previous_default_time
-    end
+    before { @previous_default_time = Capybara.default_max_wait_time }
+
+    after { Capybara.default_max_wait_time = @previous_default_time } # rubocop:disable RSpec/InstanceVariable
 
     it 'should be changeable' do
-      @previous_default_time = Capybara.default_max_wait_time
+      expect(Capybara.default_max_wait_time).not_to eq(5)
       Capybara.default_max_wait_time = 5
       expect(Capybara.default_max_wait_time).to eq(5)
     end

data/spec/css_builder_spec.rb

@@ -2,6 +2,7 @@
 
 require 'spec_helper'
 
+# rubocop:disable RSpec/InstanceVariable
 RSpec.describe Capybara::Selector::CSSBuilder do
   let :builder do
     ::Capybara::Selector::CSSBuilder.new(@css)
@@ -97,3 +98,4 @@ RSpec.describe Capybara::Selector::CSSBuilder do
     end
   end
 end
+# rubocop:enable RSpec/InstanceVariable

data/spec/dsl_spec.rb

@@ -115,14 +115,11 @@ RSpec.describe Capybara::DSL do
     end
   end
 
+  # rubocop:disable RSpec/InstanceVariable
   describe '#using_wait_time' do
-    before do
-      @previous_wait_time = Capybara.default_max_wait_time
-    end
+    before { @previous_wait_time = Capybara.default_max_wait_time }
 
-    after do
-      Capybara.default_max_wait_time = @previous_wait_time
-    end
+    after { Capybara.default_max_wait_time = @previous_wait_time }
 
     it 'should switch the wait time and switch it back' do
       in_block = nil
@@ -142,6 +139,7 @@ RSpec.describe Capybara::DSL do
       expect(Capybara.default_max_wait_time).to eq(@previous_wait_time)
     end
   end
+  # rubocop:enable RSpec/InstanceVariable
 
   describe '#app' do
     it 'should be changeable' do
@@ -249,31 +247,29 @@ RSpec.describe Capybara::DSL do
   end
 
   describe 'the DSL' do
-    before do
-      @session = Class.new { include Capybara::DSL }.new
-    end
+    let(:session) { Class.new { include Capybara::DSL }.new }
 
     it 'should be possible to include it in another class' do
-      @session.visit('/with_html')
-      @session.click_link('ullamco')
-      expect(@session.body).to include('Another World')
+      session.visit('/with_html')
+      session.click_link('ullamco')
+      expect(session.body).to include('Another World')
     end
 
     it "should provide a 'page' shortcut for more expressive tests" do
-      @session.page.visit('/with_html')
-      @session.page.click_link('ullamco')
-      expect(@session.page.body).to include('Another World')
+      session.page.visit('/with_html')
+      session.page.click_link('ullamco')
+      expect(session.page.body).to include('Another World')
     end
 
     it "should provide an 'using_session' shortcut" do
       allow(Capybara).to receive(:using_session)
-      @session.using_session(:name)
+      session.using_session(:name)
       expect(Capybara).to have_received(:using_session).with(:name)
     end
 
     it "should provide a 'using_wait_time' shortcut" do
       allow(Capybara).to receive(:using_wait_time)
-      @session.using_wait_time(6)
+      session.using_wait_time(6)
       expect(Capybara).to have_received(:using_wait_time).with(6)
     end
   end

data/spec/rack_test_spec.rb

@@ -37,55 +37,53 @@ end
 
 RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
   context 'with rack test driver' do
-    before do
-      @session = TestSessions::RackTest
-    end
+    let(:session) { TestSessions::RackTest }
 
     describe '#driver' do
       it 'should be a rack test driver' do
-        expect(@session.driver).to be_an_instance_of(Capybara::RackTest::Driver)
+        expect(session.driver).to be_an_instance_of(Capybara::RackTest::Driver)
       end
     end
 
     describe '#mode' do
       it 'should remember the mode' do
-        expect(@session.mode).to eq(:rack_test)
+        expect(session.mode).to eq(:rack_test)
       end
     end
 
     describe '#click_link' do
       after do
-        @session.driver.options[:respect_data_method] = false
+        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'
-        @session.click_link 'A link with data-method'
-        expect(@session.html).to include('The requested object was deleted')
+        session.driver.options[:respect_data_method] = true
+        session.visit '/with_html'
+        session.click_link 'A link with data-method'
+        expect(session.html).to include('The requested object was deleted')
       end
 
       it 'should not use data-method if option is false' do
-        @session.driver.options[:respect_data_method] = false
-        @session.visit '/with_html'
-        @session.click_link 'A link with data-method'
-        expect(@session.html).to include('Not deleted')
+        session.driver.options[:respect_data_method] = false
+        session.visit '/with_html'
+        session.click_link 'A link with data-method'
+        expect(session.html).to include('Not deleted')
       end
 
       it "should use data-method if available even if it's capitalized" do
-        @session.driver.options[:respect_data_method] = true
-        @session.visit '/with_html'
-        @session.click_link 'A link with capitalized data-method'
-        expect(@session.html).to include('The requested object was deleted')
+        session.driver.options[:respect_data_method] = true
+        session.visit '/with_html'
+        session.click_link 'A link with capitalized data-method'
+        expect(session.html).to include('The requested object was deleted')
       end
     end
 
     describe '#fill_in' do
       it 'should warn that :fill_options are not supported' do
         allow_any_instance_of(Capybara::RackTest::Node).to receive(:warn)
-        @session.visit '/with_html'
-        field = @session.fill_in 'test_field', with: 'not_monkey', fill_options: { random: true }
-        expect(@session).to have_field('test_field', with: 'not_monkey')
+        session.visit '/with_html'
+        field = session.fill_in 'test_field', with: 'not_monkey', fill_options: { random: true }
+        expect(session).to have_field('test_field', with: 'not_monkey')
         expect(field.base).to have_received(:warn).with("Options passed to Node#set but the RackTest driver doesn't support any - ignoring")
       end
     end
@@ -93,50 +91,50 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
     describe '#attach_file' do
       context 'with multipart form' do
         it 'should submit an empty form-data section if no file is submitted' do
-          @session.visit('/form')
-          @session.click_button('Upload Empty')
-          expect(@session.html).to include('Successfully ignored empty file field.')
+          session.visit('/form')
+          session.click_button('Upload Empty')
+          expect(session.html).to include('Successfully ignored empty file field.')
         end
       end
 
       it 'should not submit an obsolete mime type' do
-        @test_jpg_file_path = File.expand_path('fixtures/capybara.csv', File.dirname(__FILE__))
-        @session.visit('/form')
-        @session.attach_file 'form_document', @test_jpg_file_path
-        @session.click_button('Upload Single')
-        expect(@session).to have_content('Content-type: text/csv')
+        test_jpg_file_path = File.expand_path('fixtures/capybara.csv', File.dirname(__FILE__))
+        session.visit('/form')
+        session.attach_file 'form_document', test_jpg_file_path
+        session.click_button('Upload Single')
+        expect(session).to have_content('Content-type: text/csv')
       end
     end
 
     describe '#click' do
       context 'on a label' do
         it 'should toggle the associated checkbox' do
-          @session.visit('/form')
-          expect(@session).to have_unchecked_field('form_pets_cat')
-          @session.find(:label, 'Cat').click
-          expect(@session).to have_checked_field('form_pets_cat')
-          @session.find(:label, 'Cat').click
-          expect(@session).to have_unchecked_field('form_pets_cat')
-          @session.find(:label, 'McLaren').click
-          expect(@session).to have_checked_field('form_cars_mclaren', visible: :hidden)
+          session.visit('/form')
+          expect(session).to have_unchecked_field('form_pets_cat')
+          session.find(:label, 'Cat').click
+          expect(session).to have_checked_field('form_pets_cat')
+          session.find(:label, 'Cat').click
+          expect(session).to have_unchecked_field('form_pets_cat')
+          session.find(:label, 'McLaren').click
+          expect(session).to have_checked_field('form_cars_mclaren', visible: :hidden)
         end
 
         it 'should toggle the associated radio' do
-          @session.visit('/form')
-          expect(@session).to have_unchecked_field('gender_male')
-          @session.find(:label, 'Male').click
-          expect(@session).to have_checked_field('gender_male')
-          @session.find(:label, 'Female').click
-          expect(@session).to have_unchecked_field('gender_male')
+          session.visit('/form')
+          expect(session).to have_unchecked_field('gender_male')
+          session.find(:label, 'Male').click
+          expect(session).to have_checked_field('gender_male')
+          session.find(:label, 'Female').click
+          expect(session).to have_unchecked_field('gender_male')
         end
       end
     end
 
     describe '#text' do
       it 'should return original text content for textareas' do
-        @session.visit('/with_html')
-        @session.find_field('normal', type: 'textarea', with: 'banana').set('hello')
-        normal = @session.find(:css, '#normal')
+        session.visit('/with_html')
+        session.find_field('normal', type: 'textarea', with: 'banana').set('hello')
+        normal = session.find(:css, '#normal')
         expect(normal.value).to eq 'hello'
         expect(normal.text).to eq 'banana'
       end
@@ -144,8 +142,8 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
 
     describe '#style' do
       it 'should raise an error' do
-        @session.visit('/with_html')
-        el = @session.find(:css, '#first')
+        session.visit('/with_html')
+        el = session.find(:css, '#first')
         expect { el.style('display') }.to raise_error NotImplementedError, /not process CSS/
       end
     end
@@ -153,87 +151,81 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
 end
 
 RSpec.describe Capybara::RackTest::Driver do
-  before do
-    @driver = TestSessions::RackTest.driver
-  end
+  let(:driver) { TestSessions::RackTest.driver }
 
   describe ':headers option' do
     it 'should always set headers' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
-      @driver.visit('/get_header')
-      expect(@driver.html).to include('foobar')
+      driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
+      driver.visit('/get_header')
+      expect(driver.html).to include('foobar')
     end
 
     it 'should keep headers on link clicks' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
-      @driver.visit('/header_links')
-      @driver.find_xpath('.//a').first.click
-      expect(@driver.html).to include('foobar')
+      driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
+      driver.visit('/header_links')
+      driver.find_xpath('.//a').first.click
+      expect(driver.html).to include('foobar')
     end
 
     it 'should keep headers on form submit' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
-      @driver.visit('/header_links')
-      @driver.find_xpath('.//input').first.click
-      expect(@driver.html).to include('foobar')
+      driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
+      driver.visit('/header_links')
+      driver.find_xpath('.//input').first.click
+      expect(driver.html).to include('foobar')
     end
 
     it 'should keep headers on redirects' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
-      @driver.visit('/get_header_via_redirect')
-      expect(@driver.html).to include('foobar')
+      driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
+      driver.visit('/get_header_via_redirect')
+      expect(driver.html).to include('foobar')
     end
   end
 
   describe ':follow_redirects option' do
     it 'defaults to following redirects' do
-      @driver = Capybara::RackTest::Driver.new(TestApp)
+      driver = Capybara::RackTest::Driver.new(TestApp)
 
-      @driver.visit('/redirect')
-      expect(@driver.response.header['Location']).to be_nil
-      expect(@driver.current_url).to match %r{/landed$}
+      driver.visit('/redirect')
+      expect(driver.response.header['Location']).to be_nil
+      expect(driver.current_url).to match %r{/landed$}
     end
 
     it 'is possible to not follow redirects' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, follow_redirects: false)
+      driver = Capybara::RackTest::Driver.new(TestApp, follow_redirects: false)
 
-      @driver.visit('/redirect')
-      expect(@driver.response.header['Location']).to match %r{/redirect_again$}
-      expect(@driver.current_url).to match %r{/redirect$}
+      driver.visit('/redirect')
+      expect(driver.response.header['Location']).to match %r{/redirect_again$}
+      expect(driver.current_url).to match %r{/redirect$}
     end
   end
 
   describe ':redirect_limit option' do
     context 'with default redirect limit' do
-      before do
-        @driver = Capybara::RackTest::Driver.new(TestApp)
-      end
+      let(:driver) { Capybara::RackTest::Driver.new(TestApp) }
 
       it 'should follow 5 redirects' do
-        @driver.visit('/redirect/5/times')
-        expect(@driver.html).to include('redirection complete')
+        driver.visit('/redirect/5/times')
+        expect(driver.html).to include('redirection complete')
       end
 
       it 'should not follow more than 6 redirects' do
         expect do
-          @driver.visit('/redirect/6/times')
+          driver.visit('/redirect/6/times')
         end.to raise_error(Capybara::InfiniteRedirectError)
       end
     end
 
     context 'with 21 redirect limit' do
-      before do
-        @driver = Capybara::RackTest::Driver.new(TestApp, redirect_limit: 21)
-      end
+      let(:driver) { Capybara::RackTest::Driver.new(TestApp, redirect_limit: 21) }
 
       it 'should follow 21 redirects' do
-        @driver.visit('/redirect/21/times')
-        expect(@driver.html).to include('redirection complete')
+        driver.visit('/redirect/21/times')
+        expect(driver.html).to include('redirection complete')
       end
 
       it 'should not follow more than 21 redirects' do
         expect do
-          @driver.visit('/redirect/22/times')
+          driver.visit('/redirect/22/times')
         end.to raise_error(Capybara::InfiniteRedirectError)
       end
     end