capybara 2.5.0 → 2.18.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#assert_current_path' do
   before do
     @session.visit('/with_js')
@@ -11,7 +12,7 @@ Capybara::SpecHelper.spec '#assert_current_path' do
     expect { @session.assert_current_path(/w[a-z]{3}_js/) }.not_to raise_error
   end
 
-  it "should wait for current_path", :requires => [:js] do
+  it "should wait for current_path", requires: [:js] do
     @session.click_link("Change page")
     expect { @session.assert_current_path("/with_html") }.not_to raise_error
   end
@@ -33,6 +34,12 @@ Capybara::SpecHelper.spec '#assert_current_path' do
     @session.visit('/with_js?test=test')
     expect{@session.assert_current_path('/with_js', only_path: true)}.not_to raise_error
   end
+
+  it "should not cause an exception when current_url is nil" do
+    allow_any_instance_of(Capybara::Session).to receive(:current_url) { nil }
+
+    expect{@session.assert_current_path(nil)}.not_to raise_error
+  end
 end
 
 Capybara::SpecHelper.spec '#assert_no_current_path?' do
@@ -48,7 +55,7 @@ Capybara::SpecHelper.spec '#assert_no_current_path?' do
     expect{@session.assert_no_current_path(/monkey/)}.not_to raise_error
   end
 
-  it "should wait for current_path to disappear", :requires => [:js] do
+  it "should wait for current_path to disappear", requires: [:js] do
     @session.click_link("Change page")
     expect{@session.assert_no_current_path('/with_js')}.not_to raise_error
   end
@@ -56,4 +63,10 @@ Capybara::SpecHelper.spec '#assert_no_current_path?' do
   it "should not raise if the page has not the given current_path" do
     expect{@session.assert_no_current_path('/with_html')}.not_to raise_error
   end
+
+  it "should not cause an exception when current_url is nil" do
+    allow_any_instance_of(Capybara::Session).to receive(:current_url) { nil }
+
+    expect{@session.assert_no_current_path('/with_html')}.not_to raise_error
+  end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#assert_selector' do
   before do
     @session.visit('/with_html')
@@ -30,41 +31,41 @@ Capybara::SpecHelper.spec '#assert_selector' do
 
   context "with count" do
     it "should be true if the content is on the page the given number of times" do
-      @session.assert_selector("//p", :count => 3)
-      @session.assert_selector("//p//a[@id='foo']", :count => 1)
-      @session.assert_selector("//p[contains(.,'est')]", :count => 1)
+      @session.assert_selector("//p", count: 3)
+      @session.assert_selector("//p//a[@id='foo']", count: 1)
+      @session.assert_selector("//p[contains(.,'est')]", count: 1)
     end
 
     it "should be false if the content is on the page the given number of times" do
-      expect { @session.assert_selector("//p", :count => 6) }.to raise_error(Capybara::ElementNotFound)
-      expect { @session.assert_selector("//p//a[@id='foo']", :count => 2) }.to raise_error(Capybara::ElementNotFound)
-      expect { @session.assert_selector("//p[contains(.,'est')]", :count => 5) }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.assert_selector("//p", count: 6) }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.assert_selector("//p//a[@id='foo']", count: 2) }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.assert_selector("//p[contains(.,'est')]", count: 5) }.to raise_error(Capybara::ElementNotFound)
     end
 
     it "should be false if the content isn't on the page at all" do
-      expect { @session.assert_selector("//abbr", :count => 2) }.to raise_error(Capybara::ElementNotFound)
-      expect { @session.assert_selector("//p//a[@id='doesnotexist']", :count => 1) }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.assert_selector("//abbr", count: 2) }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.assert_selector("//p//a[@id='doesnotexist']", count: 1) }.to raise_error(Capybara::ElementNotFound)
     end
   end
 
   context "with text" do
     it "should discard all matches where the given string is not contained" do
-      @session.assert_selector("//p//a", :text => "Redirect", :count => 1)
-      expect { @session.assert_selector("//p", :text => "Doesnotexist") }.to raise_error(Capybara::ElementNotFound)
+      @session.assert_selector("//p//a", text: "Redirect", count: 1)
+      expect { @session.assert_selector("//p", text: "Doesnotexist") }.to raise_error(Capybara::ElementNotFound)
     end
 
     it "should discard all matches where the given regexp is not matched" do
-      @session.assert_selector("//p//a", :text => /re[dab]i/i, :count => 1)
-      expect { @session.assert_selector("//p//a", :text => /Red$/) }.to raise_error(Capybara::ElementNotFound)
+      @session.assert_selector("//p//a", text: /re[dab]i/i, count: 1)
+      expect { @session.assert_selector("//p//a", text: /Red$/) }.to raise_error(Capybara::ElementNotFound)
     end
   end
 
-  context "with wait", :requires => [:js] do
+  context "with wait", requires: [:js] do
     it "should find element if it appears before given wait duration" do
       Capybara.using_wait_time(0.1) do
         @session.visit('/with_js')
         @session.click_link('Click me')
-        @session.assert_selector(:css, "a#has-been-clicked", :text => "Has been clicked", :wait => 0.9)
+        @session.assert_selector(:css, "a#has-been-clicked", text: "Has been clicked", wait: 2)
       end
     end
   end
@@ -108,40 +109,40 @@ Capybara::SpecHelper.spec '#assert_no_selector' do
 
   context "with count" do
     it "should be false if the content is on the page the given number of times" do
-      expect { @session.assert_no_selector("//p", :count => 3) }.to raise_error(Capybara::ElementNotFound)
-      expect { @session.assert_no_selector("//p//a[@id='foo']", :count => 1) }.to raise_error(Capybara::ElementNotFound)
-      expect { @session.assert_no_selector("//p[contains(.,'est')]", :count => 1) }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.assert_no_selector("//p", count: 3) }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.assert_no_selector("//p//a[@id='foo']", count: 1) }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.assert_no_selector("//p[contains(.,'est')]", count: 1) }.to raise_error(Capybara::ElementNotFound)
     end
 
     it "should be true if the content is on the page the wrong number of times" do
-      @session.assert_no_selector("//p", :count => 6)
-      @session.assert_no_selector("//p//a[@id='foo']", :count => 2)
-      @session.assert_no_selector("//p[contains(.,'est')]", :count => 5)
+      @session.assert_no_selector("//p", count: 6)
+      @session.assert_no_selector("//p//a[@id='foo']", count: 2)
+      @session.assert_no_selector("//p[contains(.,'est')]", count: 5)
     end
 
     it "should be true if the content isn't on the page at all" do
-      @session.assert_no_selector("//abbr", :count => 2)
-      @session.assert_no_selector("//p//a[@id='doesnotexist']", :count => 1)
+      @session.assert_no_selector("//abbr", count: 2)
+      @session.assert_no_selector("//p//a[@id='doesnotexist']", count: 1)
     end
   end
 
   context "with text" do
     it "should discard all matches where the given string is contained" do
-      expect { @session.assert_no_selector("//p//a", :text => "Redirect", :count => 1) }.to raise_error(Capybara::ElementNotFound)
-      @session.assert_no_selector("//p", :text => "Doesnotexist")
+      expect { @session.assert_no_selector("//p//a", text: "Redirect", count: 1) }.to raise_error(Capybara::ElementNotFound)
+      @session.assert_no_selector("//p", text: "Doesnotexist")
     end
 
     it "should discard all matches where the given regexp is matched" do
-      expect { @session.assert_no_selector("//p//a", :text => /re[dab]i/i, :count => 1) }.to raise_error(Capybara::ElementNotFound)
-      @session.assert_no_selector("//p//a", :text => /Red$/)
+      expect { @session.assert_no_selector("//p//a", text: /re[dab]i/i, count: 1) }.to raise_error(Capybara::ElementNotFound)
+      @session.assert_no_selector("//p//a", text: /Red$/)
     end
   end
 
-  context "with wait", :requires => [:js] do
+  context "with wait", requires: [:js] do
     it "should not find element if it appears after given wait duration" do
       @session.visit('/with_js')
       @session.click_link('Click me')
-      @session.assert_no_selector(:css, "a#has-been-clicked", :text => "Has been clicked", :wait => 0.1)
+      @session.assert_no_selector(:css, "a#has-been-clicked", text: "Has been clicked", wait: 0.1)
     end
   end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#assert_text' do
   it "should be true if the given text is on the page" do
     @session.visit('/with_html')
@@ -36,6 +37,36 @@ Capybara::SpecHelper.spec '#assert_text' do
     expect(@session.assert_text('Some of this text is hidden!')).to eq(true)
   end
 
+  it "should raise error with a helpful message if the requested text is present but invisible" do
+    @session.visit('/with_html')
+    el = @session.find(:css, '#hidden-text')
+    expect do
+      el.assert_text(:visible, 'Some of this text is hidden!')
+    end.to raise_error(Capybara::ExpectationNotMet, /it was found 1 time including non-visible text/)
+  end
+
+  it "should raise error with a helpful message if the requested text is present but with incorrect case" do
+    @session.visit('/with_html')
+    expect do
+      @session.assert_text('Text With Whitespace')
+    end.to raise_error(Capybara::ExpectationNotMet, /it was found 1 time using a case insensitive search/)
+  end
+
+  it "should raise error with helpful message if requested text is present but invisible and with incorrect case", requires: [:js] do
+    @session.visit('/with_html')
+    el = @session.find(:css, '#uppercase')
+    expect do
+      el.assert_text('text here')
+    end.to raise_error(Capybara::ExpectationNotMet, /it was found 1 time using a case insensitive search and it was found 1 time including non-visible text/)
+  end
+
+  it "should raise the correct error if requested text is missing but contains regex special characters" do
+    @session.visit('/with_html')
+    expect do
+      @session.assert_text('[]*.')
+    end.to raise_error(Capybara::ExpectationNotMet, /expected to find text "\[\]\*\."/)
+  end
+
   it "should be true if the text in the page matches given regexp" do
     @session.visit('/with_html')
     expect(@session.assert_text(/Lorem/)).to eq(true)
@@ -55,7 +86,7 @@ Capybara::SpecHelper.spec '#assert_text' do
     end.to raise_error(Capybara::ExpectationNotMet)
   end
 
-  it "should wait for text to appear", :requires => [:js] do
+  it "should wait for text to appear", requires: [:js] do
     @session.visit('/with_js')
     @session.click_link('Click me')
     expect(@session.assert_text('Has been clicked')).to eq(true)
@@ -75,7 +106,7 @@ Capybara::SpecHelper.spec '#assert_text' do
     end
   end
 
-  context "with wait", :requires => [:js] do
+  context "with wait", requires: [:js] do
     it "should find element if it appears before given wait duration" do
       Capybara.using_wait_time(0) do
         @session.visit('/with_js')
@@ -102,35 +133,35 @@ Capybara::SpecHelper.spec '#assert_text' do
     end
 
     it 'ignores other filters when :count is specified' do
-      o = {:count   => 5,
-           :minimum => 6,
-           :maximum => 0,
-           :between => 0..4}
+      o = {count: 5,
+           minimum: 6,
+           maximum: 0,
+           between: 0..4}
       expect { @session.assert_text('Header', o) }.not_to raise_error
     end
     context 'with no :count expectation' do
       it 'fails if :minimum is not met' do
-        o = {:minimum => 6,
-             :maximum => 5,
-             :between => 2..7}
+        o = {minimum: 6,
+             maximum: 5,
+             between: 2..7}
         expect { @session.assert_text('Header', o) }.to raise_error(Capybara::ExpectationNotMet)
       end
       it 'fails if :maximum is not met' do
-        o = {:minimum => 0,
-             :maximum => 0,
-             :between => 2..7}
+        o = {minimum: 0,
+             maximum: 0,
+             between: 2..7}
         expect { @session.assert_text('Header', o) }.to raise_error(Capybara::ExpectationNotMet)
       end
       it 'fails if :between is not met' do
-        o = {:minimum => 0,
-             :maximum => 5,
-             :between => 0..4}
+        o = {minimum: 0,
+             maximum: 5,
+             between: 0..4}
         expect { @session.assert_text('Header', o) }.to raise_error(Capybara::ExpectationNotMet)
       end
       it 'succeeds if all combineable expectations are met' do
-        o = {:minimum => 0,
-             :maximum => 5,
-             :between => 2..7}
+        o = {minimum: 0,
+             maximum: 5,
+             between: 2..7}
         expect { @session.assert_text('Header', o) }.not_to raise_error
       end
     end
@@ -165,6 +196,14 @@ Capybara::SpecHelper.spec '#assert_no_text' do
     end.to raise_error(Capybara::ExpectationNotMet, 'expected not to find text "Some of this text is hidden!" in "Some of this text is hidden!"')
   end
 
+  it "should raise error if :all given and text is invisible." do
+    @session.visit('/with_html')
+    el = @session.find(:css, '#some-hidden-text', visible: false)
+    expect do
+      el.assert_no_text(:visible, 'hidden')
+    end.to raise_error(Capybara::ExpectationNotMet, 'expected not to find text "hidden" in "Some of this text is not hidden"')
+  end
+
   it "should be true if the text in the page doesn't match given regexp" do
     @session.visit('/with_html')
     @session.assert_no_text(/xxxxyzzz/)
@@ -184,12 +223,12 @@ Capybara::SpecHelper.spec '#assert_no_text' do
     end
   end
 
-  context "with wait", :requires => [:js] do
+  context "with wait", requires: [:js] do
     it "should not find element if it appears after given wait duration" do
       @session.visit('/with_js')
       @session.click_link('Click me')
       @session.find(:css, '#reload-list').click
-      @session.find(:css, '#the-list').assert_no_text('Foo Bar', :wait => 0.3)
+      @session.find(:css, '#the-list').assert_no_text('Foo Bar', wait: 0.3)
     end
   end
 end

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

@@ -1,26 +1,36 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#assert_title' do
   before do
     @session.visit('/with_js')
   end
 
-  it "should be true if the page's title contains the given string" do
-    expect(@session.assert_title('js')).to eq(true)
+  it "should not raise if the page's title contains the given string" do
+    expect do
+      @session.assert_title('js')
+    end.not_to raise_error
   end
 
-  it "should be true when given an empty string" do
-    expect(@session.assert_title('')).to eq(true)
+  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
-    expect(@session.assert_title(/w[a-z]{3}_js/)).to eq(true)
+    expect do
+      @session.assert_title(/w[a-z]{3}_js/)
+    end.not_to raise_error
+
     expect do
       @session.assert_title(/w[a-z]{10}_js/)
     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
+  it "should wait for title", requires: [:js] do
     @session.click_link("Change title")
-    expect(@session.assert_title("changed title")).to eq(true)
+    expect do
+      @session.assert_title("changed title", wait: 3)
+    end.not_to raise_error
   end
 
   it "should raise error if the title doesn't contain the given string" do
@@ -58,12 +68,16 @@ Capybara::SpecHelper.spec '#assert_no_title' do
     @session.assert_no_title(/monkey/)
   end
 
-  it "should wait for title to disappear", :requires => [:js] do
+  it "should wait for title to disappear", requires: [:js] do
     @session.click_link("Change title")
-    expect(@session.assert_no_title('with_js')).to eq(true)
+    expect do
+      @session.assert_no_title('with_js', wait: 3)
+    end.not_to raise_error
   end
 
-  it "should be true if the title doesn't contain the given string" do
-    expect(@session.assert_no_title('monkey')).to eq(true)
+  it "should not raise if the title doesn't contain the given string" do
+    expect do
+      @session.assert_no_title('monkey')
+    end.not_to raise_error
   end
 end

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec "#attach_file" do
   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
 
@@ -56,6 +58,12 @@ Capybara::SpecHelper.spec "#attach_file" do
       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
+      @session.click_button 'Upload Single'
+      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
       @session.click_button('Upload Multiple')
@@ -64,7 +72,7 @@ Capybara::SpecHelper.spec "#attach_file" do
     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/
+      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]
       @session.click_button('Upload Multiple')
       expect(@session.body).to include("2 | ")#number of files
@@ -80,7 +88,7 @@ Capybara::SpecHelper.spec "#attach_file" do
 
   context "with a locator that doesn't exist" do
     it "should raise an error" do
-      msg = "Unable to find file field \"does not exist\""
+      msg = "Unable to find visible file field \"does not exist\" that is not disabled"
       expect do
         @session.attach_file('does not exist', @test_file_path)
       end.to raise_error(Capybara::ElementNotFound, msg)
@@ -95,15 +103,45 @@ Capybara::SpecHelper.spec "#attach_file" do
 
   context "with :exact option" do
     it "should set a file path by partial label when false" do
-      @session.attach_file "Imag", __FILE__, :exact => false
+      @session.attach_file "Imag", __FILE__, exact:  false
       @session.click_button('awesome')
       expect(extract_results(@session)['image']).to eq(File.basename(__FILE__))
     end
 
     it "not allow partial matches when true" do
       expect do
-        @session.attach_file "Imag", __FILE__, :exact => true
+        @session.attach_file "Imag", __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
+      @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
+    end
+
+    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
+    end
+
+    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)
+    end
+
+    it "resets the style when done" 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'
+    end
+  end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#body' do
   it "should return the unmodified page body" do
     @session.visit('/')

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec "#check" do
   before do
     @session.visit('/form')
@@ -14,7 +15,7 @@ Capybara::SpecHelper.spec "#check" do
     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');
@@ -22,29 +23,29 @@ Capybara::SpecHelper.spec "#check" do
 
   describe "checking" do
     it "should not change an already checked checkbox" do
-      expect(@session.find(:xpath, "//input[@id='form_pets_dog']")['checked']).to be_truthy
+      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']")['checked']).to be_truthy
+      expect(@session.find(:xpath, "//input[@id='form_pets_dog']")).to be_checked
     end
 
     it "should check an unchecked checkbox" do
-      expect(@session.find(:xpath, "//input[@id='form_pets_cat']")['checked']).to be_falsey
+      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']")['checked']).to be_truthy
+      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
-      expect(@session.find(:xpath, "//input[@id='form_pets_cat']")['checked']).to be_falsey
+      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']")['checked']).to be_falsey
+      expect(@session.find(:xpath, "//input[@id='form_pets_cat']")).not_to be_checked
     end
 
     it "should uncheck a checked checkbox" do
-      expect(@session.find(:xpath, "//input[@id='form_pets_dog']")['checked']).to be_truthy
+      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']")['checked']).to be_falsey
+      expect(@session.find(:xpath, "//input[@id='form_pets_dog']")).not_to be_checked
     end
   end
 
@@ -68,7 +69,7 @@ Capybara::SpecHelper.spec "#check" do
 
   context "with a locator that doesn't exist" do
     it "should raise an error" do
-      msg = "Unable to find checkbox \"does not exist\""
+      msg = "Unable to find visible checkbox \"does not exist\" that is not disabled"
       expect do
         @session.check('does not exist')
       end.to raise_error(Capybara::ElementNotFound, msg)
@@ -85,29 +86,104 @@ Capybara::SpecHelper.spec "#check" do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      @session.check('Ham', :exact => false)
+      @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
       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")
+      @session.check('form[pets][]', option: "cat")
       @session.click_button('awesome')
       expect(extract_results(@session)['pets']).to include('cat')
     end
 
     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
+      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
+        @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
+        @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
+        @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')
+      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')
+      end
+    end
+
+    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')
+      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
+          @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
+          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
+          @session.check('form_cars_pagani', allow_label_click: true)
+          @session.click_button('awesome')
+          expect(extract_results(@session)['cars']).to include('pagani')
+        end
+      end
+    end
+  end
 end