capybara 2.9.2 → 2.10.0

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

@@ -12,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
@@ -49,7 +49,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

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

@@ -31,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: 0.9)
       end
     end
   end
@@ -109,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

@@ -78,7 +78,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)
@@ -98,7 +98,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')
@@ -125,35 +125,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
@@ -215,12 +215,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

@@ -19,7 +19,7 @@ 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
+  it "should wait for title", requires: [:js] do
     @session.click_link("Change title")
     expect(@session.assert_title("changed title")).to eq(true)
   end
@@ -59,7 +59,7 @@ 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)
   end

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

@@ -96,14 +96,14 @@ 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

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

@@ -15,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');
@@ -86,28 +86,28 @@ 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

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

@@ -41,28 +41,28 @@ Capybara::SpecHelper.spec "#choose" do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      @session.choose("Mal", :exact => false)
+      @session.choose("Mal", exact:  false)
       @session.click_button('awesome')
       expect(extract_results(@session)['gender']).to eq('male')
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.choose("Mal", :exact => true)
+        @session.choose("Mal", exact:  true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
 
   context "with `option` option" do
     it "can check radio buttons by their value" do
-      @session.choose('form[gender]', :option => "male")
+      @session.choose('form[gender]', option: "male")
       @session.click_button('awesome')
       expect(extract_results(@session)['gender']).to eq("male")
     end
 
     it "should raise an error if option not found" do
       expect do
-        @session.choose('form[gender]', :option => "hermaphrodite")
+        @session.choose('form[gender]', option: "hermaphrodite")
       end.to raise_error(Capybara::ElementNotFound)
     end
   end

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

@@ -4,7 +4,7 @@ Capybara::SpecHelper.spec '#click_button' do
     @session.visit('/form')
   end
 
-  it "should wait for asynchronous load", :requires => [:js] do
+  it "should wait for asynchronous load", requires: [:js] do
     @session.visit('/with_js')
     @session.click_link('Click me')
     @session.click_button('New Here')
@@ -338,6 +338,19 @@ Capybara::SpecHelper.spec '#click_button' do
       expect(extract_results(@session)['first_name']).to eq('John')
     end
   end
+
+  context "with descendant image alt given on a button defined by <button> tag" do
+    it "should submit the associated form" do
+      @session.click_button('A horse eating hay')
+      expect(extract_results(@session)['first_name']).to eq('John')
+    end
+
+    it "should work with partial matches" do
+      @session.click_button('se eating h')
+      expect(extract_results(@session)['first_name']).to eq('John')
+    end
+  end
+
   context "with a locator that doesn't exist" do
     it "should raise an error" do
       msg = "Unable to find button \"does not exist\""
@@ -414,8 +427,8 @@ Capybara::SpecHelper.spec '#click_button' do
     @session.fill_in('address1_city', :with =>'Paris')
     @session.fill_in('address1_street', :with =>'CDG')
 
-    @session.fill_in('address2_city', :with => 'Mikolaiv')
-    @session.fill_in('address2_street', :with => 'PGS')
+    @session.fill_in('address2_city', with: 'Mikolaiv')
+    @session.fill_in('address2_street', with: 'PGS')
 
     @session.click_button "awesome"
 
@@ -433,13 +446,13 @@ Capybara::SpecHelper.spec '#click_button' do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      @session.click_button('What an Awesome', :exact => false)
+      @session.click_button('What an Awesome', exact:  false)
       expect(extract_results(@session)['first_name']).to eq('John')
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.click_button('What an Awesome', :exact => true)
+        @session.click_button('What an Awesome', exact:  true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end

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

@@ -24,7 +24,7 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
     expect(extract_results(@session)['first_name']).to eq('John')
   end
 
-  it "should wait for asynchronous load", :requires => [:js] do
+  it "should wait for asynchronous load", requires: [:js] do
     @session.visit('/with_js')
     @session.click_link('Click me')
     @session.click_link_or_button('Has been clicked')
@@ -40,7 +40,7 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
     context "when `true`" do
       it "clicks on approximately matching link" do
         @session.visit('/with_html')
-        @session.click_link_or_button('abore', :exact => false)
+        @session.click_link_or_button('abore', exact:  false)
         expect(@session).to have_content('Bar')
       end
 
@@ -56,7 +56,7 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
         @session.visit('/with_html')
         msg = "Unable to find link or button \"abore\""
         expect do
-          @session.click_link_or_button('abore', :exact => true)
+          @session.click_link_or_button('abore', exact:  true)
         end.to raise_error(Capybara::ElementNotFound, msg)
       end
 
@@ -65,7 +65,7 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
         msg = "Unable to find link or button \"awe\""
 
         expect do
-          @session.click_link_or_button('awe', :exact => true)
+          @session.click_link_or_button('awe', exact:  true)
         end.to raise_error(Capybara::ElementNotFound, msg)
       end
     end
@@ -85,7 +85,7 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
     it "ignores disabled buttons when false" do
       @session.visit('/form')
       expect do
-        @session.click_link_or_button('Disabled button', :disabled => false)
+        @session.click_link_or_button('Disabled button', disabled: false)
       end.to raise_error(Capybara::ElementNotFound)
     end
 
@@ -105,7 +105,7 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
     it "does nothing when button is disabled" do
       @session.visit('/form')
       expect do
-        @session.click_link_or_button('Disabled button', :disabled => false)
+        @session.click_link_or_button('Disabled button', disabled: false)
       end.to raise_error(Capybara::ElementNotFound)
     end
 

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

@@ -4,7 +4,7 @@ Capybara::SpecHelper.spec '#click_link' do
     @session.visit('/with_html')
   end
 
-  it "should wait for asynchronous load", :requires => [:js] do
+  it "should wait for asynchronous load", requires: [:js] do
     @session.visit('/with_js')
     @session.click_link('Click me')
     @session.click_link('Has been clicked')
@@ -15,7 +15,7 @@ Capybara::SpecHelper.spec '#click_link' do
     expect(@session).to have_content('Another World')
   end
 
-  it "raises any errors caught inside the server", :requires => [:server] do
+  it "raises any errors caught inside the server", requires: [:server] do
     quietly { @session.visit("/error") }
     expect do
       @session.click_link('foo')
@@ -76,34 +76,34 @@ Capybara::SpecHelper.spec '#click_link' do
 
   context "with :href option given" do
     it "should find links with valid href" do
-      @session.click_link('labore', :href => '/with_simple_html')
+      @session.click_link('labore', href: '/with_simple_html')
       expect(@session).to have_content('Bar')
     end
 
     it "should raise error if link wasn't found" do
-      expect { @session.click_link('labore', :href => 'invalid_href') }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.click_link('labore', href: 'invalid_href') }.to raise_error(Capybara::ElementNotFound)
     end
   end
 
   context "with a regex :href option given"  do
     it "should find a link matching an all-matching regex pattern" do
-      @session.click_link('labore', :href => /.+/)
+      @session.click_link('labore', href: /.+/)
       expect(@session).to have_content('Bar')
     end
 
     it "should find a link matching an exact regex pattern" do
-      @session.click_link('labore', :href => /\/with_simple_html/)
+      @session.click_link('labore', href: /\/with_simple_html/)
       expect(@session).to have_content('Bar')
     end
 
     it "should find a link matching a partial regex pattern" do
-      @session.click_link('labore', :href => /\/with_simple/)
+      @session.click_link('labore', href: /\/with_simple/)
       expect(@session).to have_content('Bar')
     end
 
     it "should raise an error if no link's href matched the pattern" do
-      expect { @session.click_link('labore', :href => /invalid_pattern/) }.to raise_error(Capybara::ElementNotFound)
-      expect { @session.click_link('labore', :href => /.+d+/) }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.click_link('labore', href: /invalid_pattern/) }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.click_link('labore', href: /.+d+/) }.to raise_error(Capybara::ElementNotFound)
     end
   end
 
@@ -135,7 +135,7 @@ Capybara::SpecHelper.spec '#click_link' do
   end
 
   it "should do nothing on anchor links" do
-    @session.fill_in("test_field", :with => 'blah')
+    @session.fill_in("test_field", with: 'blah')
     @session.click_link('Normal Anchor')
     expect(@session.find_field("test_field").value).to eq('blah')
     @session.click_link('Blank Anchor')
@@ -145,7 +145,7 @@ Capybara::SpecHelper.spec '#click_link' do
   end
 
   it "should do nothing on URL+anchor links for the same page" do
-    @session.fill_in("test_field", :with => 'blah')
+    @session.fill_in("test_field", with: 'blah')
     @session.click_link('Anchor on same page')
     expect(@session.find_field("test_field").value).to eq('blah')
   end
@@ -169,13 +169,13 @@ Capybara::SpecHelper.spec '#click_link' do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      @session.click_link('abo', :exact => false)
+      @session.click_link('abo', exact:  false)
       expect(@session).to have_content('Bar')
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.click_link('abo', :exact => true)
+        @session.click_link('abo', exact:  true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end