capybara 2.15.1 → 3.35.3

data/lib/capybara/spec/session/{assert_title.rb → assert_title_spec.rb}

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#assert_title' do
   before do
     @session.visit('/with_js')
@@ -10,13 +11,13 @@ Capybara::SpecHelper.spec '#assert_title' do
     end.not_to raise_error
   end
 
-  it "should not raise when given an empty string" do
+  it 'should not raise when given an empty string' do
     expect do
       @session.assert_title('')
     end.not_to raise_error
   end
 
-  it "should allow regexp matches" do
+  it 'should allow regexp matches' do
     expect do
       @session.assert_title(/w[a-z]{3}_js/)
     end.not_to raise_error
@@ -26,10 +27,10 @@ Capybara::SpecHelper.spec '#assert_title' do
     end.to raise_error(Capybara::ExpectationNotMet, 'expected "with_js" to match /w[a-z]{10}_js/')
   end
 
-  it "should wait for title", requires: [:js] do
-    @session.click_link("Change title")
+  it 'should wait for title', requires: [:js] do
+    @session.click_link('Change title')
     expect do
-      @session.assert_title("changed title", wait: 3)
+      @session.assert_title('changed title', wait: 3)
     end.not_to raise_error
   end
 
@@ -39,11 +40,20 @@ Capybara::SpecHelper.spec '#assert_title' do
     end.to raise_error(Capybara::ExpectationNotMet, 'expected "with_js" to include "monkey"')
   end
 
-  it "should normalize given title" do
-    @session.assert_title('  with_js  ')
+  it 'should not normalize given title' do
+    @session.visit('/with_js')
+    expect { @session.assert_title('  with_js  ') }.to raise_error(Capybara::ExpectationNotMet)
+  end
+
+  it 'should match correctly normalized title' do
+    uri = Addressable::URI.parse('/with_title')
+    uri.query_values = { title: '   with space  title   ' }
+    @session.visit(uri.to_s)
+    @session.assert_title('  with space  title')
+    expect { @session.assert_title('with space title') }.to raise_error(Capybara::ExpectationNotMet)
   end
 
-  it "should normalize given title in error message" do
+  it 'should not normalize given title in error message' do
     expect do
       @session.assert_title(2)
     end.to raise_error(Capybara::ExpectationNotMet, 'expected "with_js" to include "2"')
@@ -55,21 +65,21 @@ Capybara::SpecHelper.spec '#assert_no_title' do
     @session.visit('/with_js')
   end
 
-  it "should raise error if the title contains the given string" do
+  it 'should raise error if the title contains the given string' do
     expect do
       @session.assert_no_title('with_j')
     end.to raise_error(Capybara::ExpectationNotMet, 'expected "with_js" not to include "with_j"')
   end
 
-  it "should allow regexp matches" do
+  it 'should allow regexp matches' do
     expect do
       @session.assert_no_title(/w[a-z]{3}_js/)
     end.to raise_error(Capybara::ExpectationNotMet, 'expected "with_js" not to match /w[a-z]{3}_js/')
     @session.assert_no_title(/monkey/)
   end
 
-  it "should wait for title to disappear", requires: [:js] do
-    @session.click_link("Change title")
+  it 'should wait for title to disappear', requires: [:js] do
+    @session.click_link('Change title')
     expect do
       @session.assert_no_title('with_js', wait: 3)
     end.not_to raise_error

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

@@ -1,147 +1,216 @@
 # frozen_string_literal: true
-Capybara::SpecHelper.spec "#attach_file" do
+
+Capybara::SpecHelper.spec '#attach_file' do
+  let(:test_file_path) { File.expand_path('../fixtures/test_file.txt', File.dirname(__FILE__)) }
+  let(:another_test_file_path) { File.expand_path('../fixtures/another_test_file.txt', File.dirname(__FILE__)) }
+  let(:test_jpg_file_path) { File.expand_path('../fixtures/capybara.jpg', File.dirname(__FILE__)) }
+  let(:no_extension_file_path) { File.expand_path('../fixtures/no_extension', File.dirname(__FILE__)) }
+
   before do
-    @test_file_path = File.expand_path('../fixtures/test_file.txt', File.dirname(__FILE__))
-    @another_test_file_path = File.expand_path('../fixtures/another_test_file.txt', File.dirname(__FILE__))
-    @test_jpg_file_path = File.expand_path('../fixtures/capybara.jpg', File.dirname(__FILE__))
-    @no_extension_file_path = File.expand_path('../fixtures/no_extension', File.dirname(__FILE__))
     @session.visit('/form')
   end
 
-  context "with normal form" do
-    it "should set a file path by id" do
-      @session.attach_file "form_image", __FILE__
+  context 'with normal form' do
+    it 'should set a file path by id' do
+      @session.attach_file 'form_image', with_os_path_separators(__FILE__)
+      @session.click_button('awesome')
+      expect(extract_results(@session)['image']).to end_with(File.basename(__FILE__))
+    end
+
+    it 'should set a file path by label' do
+      @session.attach_file 'Image', with_os_path_separators(__FILE__)
       @session.click_button('awesome')
-      expect(extract_results(@session)['image']).to eq(File.basename(__FILE__))
+      expect(extract_results(@session)['image']).to end_with(File.basename(__FILE__))
     end
 
-    it "should set a file path by label" do
-      @session.attach_file "Image", __FILE__
+    it 'should be able to set on element if no locator passed' do
+      ff = @session.find(:file_field, 'Image')
+      ff.attach_file(with_os_path_separators(__FILE__))
       @session.click_button('awesome')
-      expect(extract_results(@session)['image']).to eq(File.basename(__FILE__))
+      expect(extract_results(@session)['image']).to end_with(File.basename(__FILE__))
     end
 
-    it "casts to string" do
-      @session.attach_file :"form_image", __FILE__
+    it 'casts to string' do
+      @session.attach_file :form_image, with_os_path_separators(__FILE__)
       @session.click_button('awesome')
-      expect(extract_results(@session)['image']).to eq(File.basename(__FILE__))
+      expect(extract_results(@session)['image']).to end_with(File.basename(__FILE__))
     end
   end
 
-  context "with multipart form" do
-    it "should set a file path by id" do
-      @session.attach_file "form_document", @test_file_path
+  context 'with multipart form' do
+    it 'should set a file path by id' do
+      @session.attach_file 'form_document', with_os_path_separators(test_file_path)
       @session.click_button('Upload Single')
-      expect(@session).to have_content(File.read(@test_file_path))
+      expect(@session).to have_content(File.read(test_file_path))
     end
 
-    it "should set a file path by label" do
-      @session.attach_file "Single Document", @test_file_path
+    it 'should set a file path by label' do
+      @session.attach_file 'Single Document', with_os_path_separators(test_file_path)
       @session.click_button('Upload Single')
-      expect(@session).to have_content(File.read(@test_file_path))
+      expect(@session).to have_content(File.read(test_file_path))
     end
 
-    it "should not break if no file is submitted" do
+    it 'should not break if no file is submitted' do
       @session.click_button('Upload Single')
       expect(@session).to have_content('No file uploaded')
     end
 
-    it "should send content type text/plain when uploading a text file" do
-      @session.attach_file "Single Document", @test_file_path
+    it 'should send content type text/plain when uploading a text file' do
+      @session.attach_file 'Single Document', with_os_path_separators(test_file_path)
       @session.click_button 'Upload Single'
       expect(@session).to have_content('text/plain')
     end
 
-    it "should send content type image/jpeg when uploading an image" do
-      @session.attach_file "Single Document", @test_jpg_file_path
+    it 'should send content type image/jpeg when uploading an image' do
+      @session.attach_file 'Single Document', with_os_path_separators(test_jpg_file_path)
       @session.click_button 'Upload Single'
       expect(@session).to have_content('image/jpeg')
     end
 
-    it "should not break when uploading a file without extension" do
-      @session.attach_file "Single Document", @no_extension_file_path
+    it 'should not break when uploading a file without extension' do
+      @session.attach_file 'Single Document', with_os_path_separators(no_extension_file_path)
       @session.click_button 'Upload Single'
-      expect(@session).to have_content(File.read(@no_extension_file_path))
+      expect(@session).to have_content(File.read(no_extension_file_path))
     end
 
-    it "should not break when using HTML5 multiple file input" do
-      @session.attach_file "Multiple Documents", @test_file_path
+    it 'should not break when using HTML5 multiple file input' do
+      @session.attach_file 'Multiple Documents', with_os_path_separators(test_file_path)
       @session.click_button('Upload Multiple')
-      expect(@session).to have_content(File.read(@test_file_path))
-      expect(@session.body).to include("1 | ")#number of files
+      expect(@session).to have_content(File.read(test_file_path))
+      expect(@session.body).to include('1 | ') # number of files
     end
 
-    it  "should not break when using HTML5 multiple file input uploading multiple files" do
-      pending "Selenium is buggy on this, see http://code.google.com/p/selenium/issues/detail?id=2239" if @session.respond_to?(:mode) && @session.mode.to_s =~ /^selenium_(firefox|marionette)/
-      @session.attach_file "Multiple Documents", [@test_file_path, @another_test_file_path]
+    it 'should not break when using HTML5 multiple file input uploading multiple files' do
+      @session.attach_file('Multiple Documents',
+                           [test_file_path, another_test_file_path].map { |f| with_os_path_separators(f) })
       @session.click_button('Upload Multiple')
-      expect(@session.body).to include("2 | ")#number of files
-      expect(@session.body).to include(File.read(@test_file_path))
-      expect(@session.body).to include(File.read(@another_test_file_path))
+      expect(@session).to have_content('2 | ') # number of files
+      expect(@session.body).to include(File.read(test_file_path))
+      expect(@session.body).to include(File.read(another_test_file_path))
     end
 
-    it "should not send anything when attaching no files to a multiple upload field" do
+    it 'should not send anything when attaching no files to a multiple upload field' do
       @session.click_button('Upload Empty Multiple')
-      expect(@session).to have_content("Successfully ignored empty file field")
+      expect(@session).to have_content('Successfully ignored empty file field')
+    end
+
+    it 'should not append files to already attached' do
+      @session.attach_file 'Multiple Documents', with_os_path_separators(test_file_path)
+      @session.attach_file 'Multiple Documents', with_os_path_separators(another_test_file_path)
+      @session.click_button('Upload Multiple')
+      expect(@session).to have_content('1 | ') # number of files
+      expect(@session.body).to include(File.read(another_test_file_path))
+      expect(@session.body).not_to include(File.read(test_file_path))
+    end
+
+    it 'should fire change once when uploading multiple files from empty', requires: [:js] do
+      @session.visit('with_js')
+      @session.attach_file('multiple-file',
+                           [test_file_path, another_test_file_path].map { |f| with_os_path_separators(f) })
+      expect(@session).to have_css('.file_change', count: 1)
+    end
+
+    it 'should fire change once for each set of files uploaded', requires: [:js] do
+      @session.visit('with_js')
+      @session.attach_file('multiple-file', [test_jpg_file_path].map { |f| with_os_path_separators(f) })
+      @session.attach_file('multiple-file',
+                           [test_file_path, another_test_file_path].map { |f| with_os_path_separators(f) })
+      expect(@session).to have_css('.file_change', count: 2)
     end
   end
 
   context "with a locator that doesn't exist" do
-    it "should raise an error" do
-      msg = "Unable to find visible file field \"does not exist\" that is not disabled"
+    it 'should raise an error' do
+      msg = /Unable to find file field "does not exist"/
       expect do
-        @session.attach_file('does not exist', @test_file_path)
+        @session.attach_file('does not exist', with_os_path_separators(test_file_path))
       end.to raise_error(Capybara::ElementNotFound, msg)
     end
   end
 
   context "with a path that doesn't exist" do
-    it "should raise an error" do
+    it 'should raise an error' do
       expect { @session.attach_file('Image', '/no_such_file.png') }.to raise_error(Capybara::FileNotFound)
     end
   end
 
-  context "with :exact option" do
-    it "should set a file path by partial label when false" do
-      @session.attach_file "Imag", __FILE__, exact:  false
+  context 'with :exact option' do
+    it 'should set a file path by partial label when false' do
+      @session.attach_file 'Imag', with_os_path_separators(__FILE__), exact: false
       @session.click_button('awesome')
-      expect(extract_results(@session)['image']).to eq(File.basename(__FILE__))
+      expect(extract_results(@session)['image']).to end_with(File.basename(__FILE__))
     end
 
-    it "not allow partial matches when true" do
+    it 'should not allow partial matches when true' do
       expect do
-        @session.attach_file "Imag", __FILE__, exact:  true
+        @session.attach_file 'Imag', with_os_path_separators(__FILE__), exact: true
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
 
-  context "with :make_visible option", requires: [:js, :es_args] do
-    it "applies a default style change when true" do
+  context 'with :make_visible option', requires: %i[js es_args] do
+    it 'applies a default style change when true' do
       @session.visit('/with_js')
-      expect { @session.attach_file("hidden_file", __FILE__) }.to raise_error Capybara::ElementNotFound
-      expect {
-        @session.attach_file("hidden_file", __FILE__, make_visible: true)
-      }.not_to raise_error
+      expect do
+        @session.attach_file('hidden_file', with_os_path_separators(__FILE__))
+      end.to raise_error Capybara::ElementNotFound
+      expect do
+        @session.attach_file('hidden_file', with_os_path_separators(__FILE__), make_visible: true)
+      end.not_to raise_error
     end
 
-    it "accepts a hash of styles to be applied" do
+    it 'accepts a hash of styles to be applied' do
       @session.visit('/with_js')
-      expect {
-        @session.attach_file("hidden_file", __FILE__, make_visible: { opacity: 1, display: 'block' })
-      }.not_to raise_error
+      expect do
+        @session.attach_file('hidden_file',
+                             with_os_path_separators(__FILE__),
+                             make_visible: { opacity: 1, display: 'block' })
+      end.not_to raise_error
     end
 
-    it "raises an error when the file input is not made visible" do
+    it 'raises an error when the file input is not made visible' do
       @session.visit('/with_js')
-      expect {
-        @session.attach_file("hidden_file", __FILE__, make_visible: { color: 'red' })
-      }.to raise_error(Capybara::ExpectationNotMet)
+      expect do
+        @session.attach_file('hidden_file', with_os_path_separators(__FILE__), make_visible: { color: 'red' })
+      end.to raise_error(Capybara::ExpectationNotMet)
+    end
+
+    it 'resets the style when done' do
+      @session.visit('/with_js')
+      @session.attach_file('hidden_file', with_os_path_separators(__FILE__), make_visible: true)
+      expect(@session.evaluate_script('arguments[0].style.display', @session.find(:css, '#hidden_file', visible: :all))).to eq 'none'
+    end
+
+    it 'should fire change' do
+      @session.visit('/with_js')
+      @session.attach_file('hidden_file', with_os_path_separators(__FILE__), make_visible: true)
+      expect(@session).to have_css('.file_change')
+    end
+  end
+
+  context 'with a block', requires: %i[js] do
+    it 'can upload by clicking the file input' do
+      @session.attach_file(with_os_path_separators(__FILE__)) do
+        @session.find(:file_field, 'form[image]').click
+      end
+      @session.click_button('awesome')
+      expect(extract_results(@session)['image']).to end_with(File.basename(__FILE__))
+    end
+
+    it 'can upload by clicking the label' do
+      @session.attach_file(with_os_path_separators(__FILE__)) do
+        @session.find(:label, 'Hidden Image').click
+      end
+      @session.click_button('awesome')
+      expect(extract_results(@session)['hidden_image']).to end_with(File.basename(__FILE__))
     end
 
-    it "resets the style when done" do
+    it 'should fire change' do
       @session.visit('/with_js')
-      @session.attach_file("hidden_file", __FILE__, make_visible: true)
-      expect(@session.evaluate_script("arguments[0].style.display", @session.find(:css, '#hidden_file', visible: :all))).to eq 'none'
+      @session.attach_file(with_os_path_separators(__FILE__)) do
+        @session.find(:label, 'Label for hidden file input').click
+      end
+      expect(@session).to have_css('.file_change')
     end
   end
 end

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

@@ -1,24 +1,23 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#body' do
-  it "should return the unmodified page body" do
+  it 'should return the unmodified page body' do
     @session.visit('/')
     expect(@session).to have_content('Hello world!') # wait for content to appear if visit is async
     expect(@session.body).to include('Hello world!')
   end
 
-  if "".respond_to?(:encoding)
-    context "encoding of response between ascii and utf8" do
-      it "should be valid with html entities" do
-        @session.visit('/with_html_entities')
-        expect(@session).to have_content('Encoding') # wait for content to appear if visit is async
-        expect { @session.body.encode!("UTF-8") }.not_to raise_error
-      end
+  context 'encoding of response between ascii and utf8' do
+    it 'should be valid with html entities' do
+      @session.visit('/with_html_entities')
+      expect(@session).to have_content('Encoding') # wait for content to appear if visit is async
+      expect { @session.body.encode!('UTF-8') }.not_to raise_error
+    end
 
-      it "should be valid without html entities" do
-        @session.visit('/with_html')
-        expect(@session).to have_content('This is a test') # wait for content to appear if visit is async
-        expect { @session.body.encode!("UTF-8") }.not_to raise_error
-      end
+    it 'should be valid without html entities' do
+      @session.visit('/with_html')
+      expect(@session).to have_content('This is a test') # wait for content to appear if visit is async
+      expect { @session.body.encode!('UTF-8') }.not_to raise_error
     end
   end
 end

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

@@ -1,188 +1,240 @@
 # frozen_string_literal: true
-Capybara::SpecHelper.spec "#check" do
+
+Capybara::SpecHelper.spec '#check' do
   before do
     @session.visit('/form')
   end
 
   describe "'checked' attribute" do
-    it "should be true if checked" do
-      @session.check("Terms of Use")
+    it 'should be true if checked' do
+      @session.check('Terms of Use')
       expect(@session.find(:xpath, "//input[@id='form_terms_of_use']")['checked']).to be_truthy
     end
 
-    it "should be false if unchecked" do
+    it 'should be false if unchecked' do
       expect(@session.find(:xpath, "//input[@id='form_terms_of_use']")['checked']).to be_falsey
     end
   end
 
-  it "should trigger associated events", requires: [:js] do
+  it 'should trigger associated events', requires: [:js] do
     @session.visit('/with_js')
     @session.check('checkbox_with_event')
-    expect(@session).to have_css('#checkbox_event_triggered');
+    expect(@session).to have_css('#checkbox_event_triggered')
   end
 
-  describe "checking" do
-    it "should not change an already checked checkbox" do
+  describe 'checking' do
+    it 'should not change an already checked checkbox' do
       expect(@session.find(:xpath, "//input[@id='form_pets_dog']")).to be_checked
       @session.check('form_pets_dog')
       expect(@session.find(:xpath, "//input[@id='form_pets_dog']")).to be_checked
     end
 
-    it "should check an unchecked checkbox" do
+    it 'should check an unchecked checkbox' do
       expect(@session.find(:xpath, "//input[@id='form_pets_cat']")).not_to be_checked
       @session.check('form_pets_cat')
       expect(@session.find(:xpath, "//input[@id='form_pets_cat']")).to be_checked
     end
   end
 
-  describe "unchecking" do
-    it "should not change an already unchecked checkbox" do
+  describe 'unchecking' do
+    it 'should not change an already unchecked checkbox' do
       expect(@session.find(:xpath, "//input[@id='form_pets_cat']")).not_to be_checked
       @session.uncheck('form_pets_cat')
       expect(@session.find(:xpath, "//input[@id='form_pets_cat']")).not_to be_checked
     end
 
-    it "should uncheck a checked checkbox" do
+    it 'should uncheck a checked checkbox' do
       expect(@session.find(:xpath, "//input[@id='form_pets_dog']")).to be_checked
       @session.uncheck('form_pets_dog')
       expect(@session.find(:xpath, "//input[@id='form_pets_dog']")).not_to be_checked
     end
   end
 
-  it "should check a checkbox by id" do
-    @session.check("form_pets_cat")
+  it 'should check a checkbox by id' do
+    @session.check('form_pets_cat')
+    @session.click_button('awesome')
+    expect(extract_results(@session)['pets']).to include('dog', 'cat', 'hamster')
+  end
+
+  it 'should check a checkbox by label' do
+    @session.check('Cat')
     @session.click_button('awesome')
     expect(extract_results(@session)['pets']).to include('dog', 'cat', 'hamster')
   end
 
-  it "should check a checkbox by label" do
-    @session.check("Cat")
+  it 'should work without a locator string' do
+    @session.check(id: 'form_pets_cat')
     @session.click_button('awesome')
     expect(extract_results(@session)['pets']).to include('dog', 'cat', 'hamster')
   end
 
-  it "casts to string" do
-    @session.check(:"form_pets_cat")
+  it 'should be able to check itself if no locator specified' do
+    cb = @session.find(:id, 'form_pets_cat')
+    cb.check
+    @session.click_button('awesome')
+    expect(extract_results(@session)['pets']).to include('dog', 'cat', 'hamster')
+  end
+
+  it 'casts to string' do
+    @session.check(:form_pets_cat)
     @session.click_button('awesome')
     expect(extract_results(@session)['pets']).to include('dog', 'cat', 'hamster')
   end
 
   context "with a locator that doesn't exist" do
-    it "should raise an error" do
-      msg = "Unable to find visible checkbox \"does not exist\" that is not disabled"
+    it 'should raise an error' do
+      msg = /Unable to find checkbox "does not exist"/
       expect do
         @session.check('does not exist')
       end.to raise_error(Capybara::ElementNotFound, msg)
     end
   end
 
-  context "with a disabled checkbox" do
-    it "should raise an error" do
+  context 'with a disabled checkbox' do
+    it 'should raise an error' do
+      msg = 'Unable to find visible checkbox "Disabled Checkbox" that is not disabled'
       expect do
         @session.check('Disabled Checkbox')
-      end.to raise_error(Capybara::ElementNotFound)
+      end.to raise_error(Capybara::ElementNotFound, msg)
     end
   end
 
-  context "with :exact option" do
-    it "should accept partial matches when false" do
-      @session.check('Ham', exact:  false)
+  context 'with :exact option' do
+    it 'should accept partial matches when false' do
+      @session.check('Ham', exact: false)
       @session.click_button('awesome')
       expect(extract_results(@session)['pets']).to include('hamster')
     end
 
-    it "should not accept partial matches when true" do
+    it 'should not accept partial matches when true' do
       expect do
-        @session.check('Ham', exact:  true)
+        @session.check('Ham', exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
 
-  context "with `option` option" do
-    it "can check boxes by their value" do
-      @session.check('form[pets][]', option: "cat")
+  context 'with `option` option' do
+    it 'can check boxes by their value' do
+      @session.check('form[pets][]', option: 'cat')
+      @session.click_button('awesome')
+      expect(extract_results(@session)['pets']).to include('cat')
+    end
+
+    it 'should alias `with`' do
+      @session.check('form[pets][]', with: 'cat')
       @session.click_button('awesome')
       expect(extract_results(@session)['pets']).to include('cat')
     end
 
-    it "should raise an error if option not found" do
+    it 'should raise an error if option not found' do
       expect do
-        @session.check('form[pets][]', option: "elephant")
+        @session.check('form[pets][]', option: 'elephant')
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
 
-  context "when checkbox hidden" do
-    context "with Capybara.automatic_label_click == true" do
+  context 'when checkbox hidden' do
+    context 'with Capybara.automatic_label_click == true' do
       around do |spec|
         old_click_label, Capybara.automatic_label_click = Capybara.automatic_label_click, true
         spec.run
         Capybara.automatic_label_click = old_click_label
       end
 
-      it "should check via clicking the label with :for attribute if possible" do
-        expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be
+      it 'should check via clicking the label with :for attribute if possible' do
+        expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be_truthy
         @session.check('form_cars_tesla')
         @session.click_button('awesome')
         expect(extract_results(@session)['cars']).to include('tesla')
       end
 
-      it "should check via clicking the wrapping label if possible" do
-        expect(@session.find(:checkbox, 'form_cars_mclaren', unchecked: true, visible: :hidden)).to be
+      it 'should check via clicking the wrapping label if possible' do
+        expect(@session.find(:checkbox, 'form_cars_mclaren', unchecked: true, visible: :hidden)).to be_truthy
         @session.check('form_cars_mclaren')
         @session.click_button('awesome')
         expect(extract_results(@session)['cars']).to include('mclaren')
       end
 
-      it "should not click the label if unneeded" do
-        expect(@session.find(:checkbox, 'form_cars_jaguar', checked: true, visible: :hidden)).to be
+      it 'should check via clicking the label with :for attribute if locator nil' do
+        cb = @session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)
+        cb.check
+        @session.click_button('awesome')
+        expect(extract_results(@session)['cars']).to include('tesla')
+      end
+
+      it 'should check self via clicking the wrapping label if locator nil' do
+        cb = @session.find(:checkbox, 'form_cars_mclaren', unchecked: true, visible: :hidden)
+        cb.check
+        @session.click_button('awesome')
+        expect(extract_results(@session)['cars']).to include('mclaren')
+      end
+
+      it 'should not click the label if unneeded' do
+        expect(@session.find(:checkbox, 'form_cars_jaguar', checked: true, visible: :hidden)).to be_truthy
         @session.check('form_cars_jaguar')
         @session.click_button('awesome')
         expect(extract_results(@session)['cars']).to include('jaguar')
       end
 
-      it "should raise original error when no label available" do
-        expect { @session.check('form_cars_ariel') }.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_ariel" that is not disabled')
+      it 'should raise original error when no label available' do
+        expect { @session.check('form_cars_ariel') }.to raise_error(Capybara::ElementNotFound, /Unable to find visible checkbox "form_cars_ariel"/)
       end
 
-      it "should raise error if not allowed to click label" do
-        expect{@session.check('form_cars_mclaren', allow_label_click: false)}.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_mclaren" that is not disabled')
+      it 'should raise error if not allowed to click label' do
+        expect { @session.check('form_cars_mclaren', allow_label_click: false) }.to raise_error(Capybara::ElementNotFound, /Unable to find visible checkbox "form_cars_mclaren"/)
       end
     end
 
-    context "with Capybara.automatic_label_click == false" do
+    context 'with Capybara.automatic_label_click == false' do
       around do |spec|
         old_label_click, Capybara.automatic_label_click = Capybara.automatic_label_click, false
         spec.run
         Capybara.automatic_label_click = old_label_click
       end
 
-      it "should raise error if checkbox not visible" do
-        expect{@session.check('form_cars_mclaren')}.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_mclaren" that is not disabled')
+      it 'should raise error if checkbox not visible' do
+        expect { @session.check('form_cars_mclaren') }.to raise_error(Capybara::ElementNotFound, /Unable to find visible checkbox "form_cars_mclaren"/)
       end
 
-      context "with allow_label_click == true" do
-        it "should check via the label if input is hidden" do
-          expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be
+      it 'should include node filter in error if verified' do
+        expect { @session.check('form_cars_maserati') }.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_maserati" that is not disabled')
+      end
+
+      context 'with allow_label_click == true' do
+        it 'should check via the label if input is hidden' do
+          expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be_truthy
           @session.check('form_cars_tesla', allow_label_click: true)
           @session.click_button('awesome')
           expect(extract_results(@session)['cars']).to include('tesla')
         end
 
-        it "should not wait the full time if label can be clicked" do
-          expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be
+        it 'should not wait the full time if label can be clicked' do
+          expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be_truthy
           start_time = Time.now
           @session.check('form_cars_tesla', allow_label_click: true, wait: 10)
           end_time = Time.now
           expect(end_time - start_time).to be < 10
         end
 
-        it "should check via the label if input is moved off the left edge of the page" do
-          expect(@session.find(:checkbox, 'form_cars_pagani', unchecked: true, visible: :all)).to be
+        it 'should check via the label if input is moved off the left edge of the page' do
+          expect(@session.find(:checkbox, 'form_cars_pagani', unchecked: true, visible: :all)).to be_truthy
           @session.check('form_cars_pagani', allow_label_click: true)
           @session.click_button('awesome')
           expect(extract_results(@session)['cars']).to include('pagani')
         end
+
+        it 'should check via the label if input is visible but blocked by another element' do
+          expect(@session.find(:checkbox, 'form_cars_bugatti', unchecked: true, visible: :all)).to be_truthy
+          @session.check('form_cars_bugatti', allow_label_click: true)
+          @session.click_button('awesome')
+          expect(extract_results(@session)['cars']).to include('bugatti')
+        end
+
+        it 'should check via label if multiple labels' do
+          expect(@session).to have_field('multi_label_checkbox', checked: false, visible: :hidden)
+          @session.check('Label to click', allow_label_click: true)
+          expect(@session).to have_field('multi_label_checkbox', checked: true, visible: :hidden)
+        end
       end
     end
   end