capybara 2.9.0 → 2.10.0

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

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

@@ -85,13 +85,13 @@ Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
     should_be_on 0, "/landed"
   end
 
-  it "is affected by pushState", :requires => [:js] do
+  it "is affected by pushState", requires: [:js] do
     @session.visit("/with_js")
     @session.execute_script("window.history.pushState({}, '', '/pushed')")
     expect(@session.current_path).to eq("/pushed")
   end
 
-  it "is affected by replaceState", :requires => [:js] do
+  it "is affected by replaceState", requires: [:js] do
     @session.visit("/with_js")
     @session.execute_script("window.history.replaceState({}, '', '/replaced')")
     expect(@session.current_path).to eq("/replaced")

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-Capybara::SpecHelper.spec '#dismiss_confirm', :requires => [:modals] do
+Capybara::SpecHelper.spec '#dismiss_confirm', requires: [:modals] do
   before do
     @session.visit('/with_js')
   end

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-Capybara::SpecHelper.spec '#dismiss_prompt', :requires => [:modals] do
+Capybara::SpecHelper.spec '#dismiss_prompt', requires: [:modals] do
   before do
     @session.visit('/with_js')
   end

data/lib/capybara/spec/session/element/matches_selector_spec.rb

@@ -24,8 +24,8 @@ Capybara::SpecHelper.spec '#match_selector?' do
 
   context "with text" do
     it "should discard all matches where the given string is not contained" do
-      expect(@element).to match_selector("//span", :text => "42")
-      expect(@element).not_to match_selector("//span", :text => "Doesnotexist")
+      expect(@element).to match_selector("//span", text: "42")
+      expect(@element).not_to match_selector("//span", text: "Doesnotexist")
     end
   end
 
@@ -42,6 +42,19 @@ Capybara::SpecHelper.spec '#match_selector?' do
     expect(@element.matches_xpath?("//span", text: '42')).to be true
     expect(@element.matches_xpath?("//span", text: 'Nope')).to be false
   end
+
+  it 'should accept selector filters' do
+    @session.visit('/form')
+    cbox = @session.find(:css, '#form_pets_dog')
+    expect(cbox.matches_selector?(:checkbox, id: 'form_pets_dog', option: 'dog', name: 'form[pets][]', checked: true)).to be true
+  end
+
+  it 'should accept a custom filter block' do
+    @session.visit('/form')
+    cbox = @session.find(:css, '#form_pets_dog')
+    expect(cbox.matches_selector?(:checkbox){ |node| node[:id] == "form_pets_dog"}).to be true
+    expect(cbox.matches_selector?(:checkbox){ |node| node[:id] != "form_pets_dog"}).to be false
+  end
 end
 
 Capybara::SpecHelper.spec '#not_matches_selector?' do
@@ -70,22 +83,22 @@ Capybara::SpecHelper.spec '#not_matches_selector?' do
 
   context "with text" do
     it "should discard all matches where the given string is contained" do
-      expect(@element).not_to not_match_selector(:css, "span.number", :text => "42")
-      expect(@element).to not_match_selector(:css, "span.number", :text => "Doesnotexist")
+      expect(@element).not_to not_match_selector(:css, "span.number", text: "42")
+      expect(@element).to not_match_selector(:css, "span.number", text: "Doesnotexist")
     end
   end
 
   it "should have CSS sugar" do
     expect(@element.not_matches_css?("span.number")).to be false
     expect(@element.not_matches_css?("p a#doesnotexist")).to be true
-    expect(@element.not_matches_css?("span.number", :text => "42")).to be false
-    expect(@element.not_matches_css?("span.number", :text => "Doesnotexist")).to be true
+    expect(@element.not_matches_css?("span.number", text: "42")).to be false
+    expect(@element.not_matches_css?("span.number", text: "Doesnotexist")).to be true
   end
 
   it "should have xpath sugar" do
     expect(@element.not_matches_xpath?("//span")).to be false
     expect(@element.not_matches_xpath?("//div")).to be true
-    expect(@element.not_matches_xpath?("//span", :text => "42")).to be false
-    expect(@element.not_matches_xpath?("//span", :text => "Doesnotexist")).to be true
+    expect(@element.not_matches_xpath?("//span", text: "42")).to be false
+    expect(@element.not_matches_xpath?("//span", text: "Doesnotexist")).to be true
   end
 end if Gem::Version.new(RSpec::Expectations::Version::STRING) >= Gem::Version.new('3.1')

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-Capybara::SpecHelper.spec "#evaluate_script", :requires => [:js] do
+Capybara::SpecHelper.spec "#evaluate_script", requires: [:js] do
   it "should evaluate the given script and return whatever it produces" do
     @session.visit('/with_js')
     expect(@session.evaluate_script("1+3")).to eq(4)

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
-Capybara::SpecHelper.spec "#execute_script", :requires => [:js] do
+Capybara::SpecHelper.spec "#execute_script", requires: [:js] do
   it "should execute the given script and return nothing" do
     @session.visit('/with_js')
     expect(@session.execute_script("document.getElementById('change').textContent = 'Funky Doodle'")).to be_nil
-    expect(@session).to have_css('#change', :text => 'Funky Doodle')
+    expect(@session).to have_css('#change', text: 'Funky Doodle')
   end
 
   it "should be able to call functions defined in the page" do

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

@@ -5,97 +5,97 @@ Capybara::SpecHelper.spec "#fill_in" do
   end
 
   it "should fill in a text field by id" do
-    @session.fill_in('form_first_name', :with => 'Harry')
+    @session.fill_in('form_first_name', with: 'Harry')
     @session.click_button('awesome')
     expect(extract_results(@session)['first_name']).to eq('Harry')
   end
 
   it "should fill in a text field by name" do
-    @session.fill_in('form[last_name]', :with => 'Green')
+    @session.fill_in('form[last_name]', with: 'Green')
     @session.click_button('awesome')
     expect(extract_results(@session)['last_name']).to eq('Green')
   end
 
   it "should fill in a text field by label without for" do
-    @session.fill_in('First Name', :with => 'Harry')
+    @session.fill_in('First Name', with: 'Harry')
     @session.click_button('awesome')
     expect(extract_results(@session)['first_name']).to eq('Harry')
   end
 
   it "should fill in a url field by label without for" do
-    @session.fill_in('Html5 Url', :with => 'http://www.avenueq.com')
+    @session.fill_in('Html5 Url', with: 'http://www.avenueq.com')
     @session.click_button('html5_submit')
     expect(extract_results(@session)['html5_url']).to eq('http://www.avenueq.com')
   end
 
   it "should fill in a textarea by id" do
-    @session.fill_in('form_description', :with => 'Texty text')
+    @session.fill_in('form_description', with: 'Texty text')
     @session.click_button('awesome')
     expect(extract_results(@session)['description']).to eq('Texty text')
   end
 
   it "should fill in a textarea by label" do
-    @session.fill_in('Description', :with => 'Texty text')
+    @session.fill_in('Description', with: 'Texty text')
     @session.click_button('awesome')
     expect(extract_results(@session)['description']).to eq('Texty text')
   end
 
   it "should fill in a textarea by name" do
-    @session.fill_in('form[description]', :with => 'Texty text')
+    @session.fill_in('form[description]', with: 'Texty text')
     @session.click_button('awesome')
     expect(extract_results(@session)['description']).to eq('Texty text')
   end
 
   it "should fill in a password field by id" do
-    @session.fill_in('form_password', :with => 'supasikrit')
+    @session.fill_in('form_password', with: 'supasikrit')
     @session.click_button('awesome')
     expect(extract_results(@session)['password']).to eq('supasikrit')
   end
 
   it "should handle HTML in a textarea" do
-    @session.fill_in('form_description', :with => 'is <strong>very</strong> secret!')
+    @session.fill_in('form_description', with: 'is <strong>very</strong> secret!')
     @session.click_button('awesome')
     expect(extract_results(@session)['description']).to eq('is <strong>very</strong> secret!')
   end
 
   it "should handle newlines in a textarea" do
-    @session.fill_in('form_description', :with => "\nSome text\n")
+    @session.fill_in('form_description', with: "\nSome text\n")
     @session.click_button('awesome')
     expect(extract_results(@session)['description']).to eq("\r\nSome text\r\n")
   end
 
   it "should fill in a field with a custom type" do
-    @session.fill_in('Schmooo', :with => 'Schmooo is the game')
+    @session.fill_in('Schmooo', with: 'Schmooo is the game')
     @session.click_button('awesome')
     expect(extract_results(@session)['schmooo']).to eq('Schmooo is the game')
   end
 
   it "should fill in a field without a type" do
-    @session.fill_in('Phone', :with => '+1 555 7022')
+    @session.fill_in('Phone', with: '+1 555 7022')
     @session.click_button('awesome')
     expect(extract_results(@session)['phone']).to eq('+1 555 7022')
   end
 
   it "should fill in a text field respecting its maxlength attribute" do
-    @session.fill_in('Zipcode', :with => '52071350')
+    @session.fill_in('Zipcode', with: '52071350')
     @session.click_button('awesome')
     expect(extract_results(@session)['zipcode']).to eq('52071')
   end
 
   it "should fill in a password field by name" do
-    @session.fill_in('form[password]', :with => 'supasikrit')
+    @session.fill_in('form[password]', with: 'supasikrit')
     @session.click_button('awesome')
     expect(extract_results(@session)['password']).to eq('supasikrit')
   end
 
   it "should fill in a password field by label" do
-    @session.fill_in('Password', :with => 'supasikrit')
+    @session.fill_in('Password', with: 'supasikrit')
     @session.click_button('awesome')
     expect(extract_results(@session)['password']).to eq('supasikrit')
   end
 
   it "should fill in a password field by name" do
-    @session.fill_in('form[password]', :with => 'supasikrit')
+    @session.fill_in('form[password]', with: 'supasikrit')
     @session.click_button('awesome')
     expect(extract_results(@session)['password']).to eq('supasikrit')
   end
@@ -104,39 +104,39 @@ Capybara::SpecHelper.spec "#fill_in" do
     expect {@session.fill_in 'Name', 'ignu'}.to raise_error(RuntimeError, /with/)
   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.fill_in('new_field', :with => 'Testing...')
+    @session.fill_in('new_field', with: 'Testing...')
   end
 
   it "casts to string" do
-    @session.fill_in(:'form_first_name', :with => :'Harry')
+    @session.fill_in(:'form_first_name', with: :'Harry')
     @session.click_button('awesome')
     expect(extract_results(@session)['first_name']).to eq('Harry')
   end
 
   it "casts to string if field has maxlength" do
-    @session.fill_in(:'form_zipcode', :with => 1234567)
+    @session.fill_in(:'form_zipcode', with: 1234567)
     @session.click_button('awesome')
     expect(extract_results(@session)['zipcode']).to eq('12345')
   end
 
-  context 'on a pre-populated textfield with a reformatting onchange', :requires => [:js] do
+  context 'on a pre-populated textfield with a reformatting onchange', requires: [:js] do
     it 'should only trigger onchange once' do
       @session.visit('/with_js')
-      @session.fill_in('with_change_event', :with => 'some value')
+      @session.fill_in('with_change_event', with: 'some value')
       # click outside the field to trigger the change event
       @session.find(:css, 'body').click
-      expect(@session.find(:css, '.change_event_triggered', :match => :one)).to have_text 'some value'
+      expect(@session.find(:css, '.change_event_triggered', match: :one)).to have_text 'some value'
     end
 
     it 'should trigger change when clearing field' do
       @session.visit('/with_js')
-      @session.fill_in('with_change_event', :with => '')
+      @session.fill_in('with_change_event', with: '')
       # click outside the field to trigger the change event
       @session.find(:css, 'body').click
-      expect(@session).to have_selector(:css, '.change_event_triggered', :match => :one)
+      expect(@session).to have_selector(:css, '.change_event_triggered', match: :one)
     end
   end
 
@@ -146,7 +146,7 @@ Capybara::SpecHelper.spec "#fill_in" do
     it "should not find a hidden field" do
       msg = "Unable to find field \"Super Secret\""
       expect do
-        @session.fill_in('Super Secret', :with => '777')
+        @session.fill_in('Super Secret', with: '777')
       end.to raise_error(Capybara::ElementNotFound, msg)
     end
   end
@@ -155,7 +155,7 @@ Capybara::SpecHelper.spec "#fill_in" do
     it "should raise an error" do
       msg = "Unable to find field \"does not exist\""
       expect do
-        @session.fill_in('does not exist', :with => 'Blah blah')
+        @session.fill_in('does not exist', with: 'Blah blah')
       end.to raise_error(Capybara::ElementNotFound, msg)
     end
   end
@@ -163,21 +163,21 @@ Capybara::SpecHelper.spec "#fill_in" do
   context "on a disabled field" do
     it "should raise an error" do
       expect do
-        @session.fill_in('Disabled Text Field', :with => 'Blah blah')
+        @session.fill_in('Disabled Text Field', with: 'Blah blah')
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      @session.fill_in("Explanation", :with => "Dude", :exact => false)
+      @session.fill_in("Explanation", with: "Dude", exact:  false)
       @session.click_button("awesome")
       expect(extract_results(@session)["name_explanation"]).to eq("Dude")
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.fill_in("Explanation", :with => "Dude", :exact => true)
+        @session.fill_in("Explanation", with: "Dude", exact:  true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end

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

@@ -33,24 +33,24 @@ Capybara::SpecHelper.spec '#find_button' do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      expect(@session.find_button('What an Awesome', :exact => false).value).to eq("awesome")
+      expect(@session.find_button('What an Awesome', exact:  false).value).to eq("awesome")
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.find_button('What an Awesome', :exact => true)
+        @session.find_button('What an Awesome', exact:  true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
 
   context "with :disabled option" do
     it "should find disabled buttons when true" do
-      expect(@session.find_button('Disabled button', :disabled => true).value).to eq("Disabled button")
+      expect(@session.find_button('Disabled button', disabled: true).value).to eq("Disabled button")
     end
 
     it "should not find disabled buttons when false" do
       expect do
-        @session.find_button('Disabled button', :disabled => false)
+        @session.find_button('Disabled button', disabled: false)
       end.to raise_error(Capybara::ElementNotFound)
     end
 
@@ -61,7 +61,7 @@ Capybara::SpecHelper.spec '#find_button' do
     end
 
     it "should find disabled buttons when :all" do
-      expect(@session.find_button('Disabled button', :disabled => :all).value).to eq("Disabled button")
+      expect(@session.find_button('Disabled button', disabled: :all).value).to eq("Disabled button")
     end
   end
 

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

@@ -20,12 +20,12 @@ Capybara::SpecHelper.spec '#find_by_id' do
 
   context "with :visible option" do
     it "finds invisible elements when `false`" do
-      expect(@session.find_by_id("hidden_via_ancestor", :visible => false).text(:all)).to match(/with hidden ancestor/)
+      expect(@session.find_by_id("hidden_via_ancestor", visible: false).text(:all)).to match(/with hidden ancestor/)
     end
 
     it "finds invisible elements when `false`" do
       expect do
-        @session.find_by_id("hidden_via_ancestor", :visible => true)
+        @session.find_by_id("hidden_via_ancestor", visible: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end

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

@@ -8,7 +8,6 @@ Capybara::SpecHelper.spec '#find_field' do
     expect(@session.find_field('Dog').value).to eq('dog')
     expect(@session.find_field('form_description').text).to eq('Descriptive text goes here')
     expect(@session.find_field('Region')[:name]).to eq('form[region]')
-
   end
 
   context "aria_label attribute with Capybara.enable_aria_label" do
@@ -50,24 +49,24 @@ Capybara::SpecHelper.spec '#find_field' do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      expect(@session.find_field("Explanation", :exact => false)[:name]).to eq("form[name_explanation]")
+      expect(@session.find_field("Explanation", exact:  false)[:name]).to eq("form[name_explanation]")
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.find_field("Explanation", :exact => true)
+        @session.find_field("Explanation", exact:  true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
 
   context "with :disabled option" do
     it "should find disabled fields when true" do
-      expect(@session.find_field("Disabled Checkbox", :disabled => true)[:name]).to eq("form[disabled_checkbox]")
+      expect(@session.find_field("Disabled Checkbox", disabled: true)[:name]).to eq("form[disabled_checkbox]")
     end
 
     it "should not find disabled fields when false" do
       expect do
-        @session.find_field("Disabled Checkbox", :disabled => false)
+        @session.find_field("Disabled Checkbox", disabled: false)
       end.to raise_error(Capybara::ElementNotFound)
     end
 
@@ -78,11 +77,11 @@ Capybara::SpecHelper.spec '#find_field' do
     end
 
     it "should find disabled fields when :all" do
-      expect(@session.find_field("Disabled Checkbox", :disabled => :all)[:name]).to eq("form[disabled_checkbox]")
+      expect(@session.find_field("Disabled Checkbox", disabled: :all)[:name]).to eq("form[disabled_checkbox]")
     end
 
     it "should find enabled fields when :all" do
-      expect(@session.find_field('Dog', :disabled => :all).value).to eq('dog')
+      expect(@session.find_field('Dog', disabled: :all).value).to eq('dog')
     end
   end
 
@@ -107,4 +106,9 @@ Capybara::SpecHelper.spec '#find_field' do
       expect(@session.find_field(with: 'dog')['id']).to eq "form_pets_dog"
     end
   end
+
+  it "should accept an optional filter block" do
+    # this would be better done with the :with option but this is just a test
+    expect(@session.find_field('form[pets][]'){ |node| node.value == 'dog' }[:id]).to eq "form_pets_dog"
+  end
 end

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

@@ -33,12 +33,12 @@ Capybara::SpecHelper.spec '#find_link' do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      expect(@session.find_link('abo', :exact => false).text).to eq("labore")
+      expect(@session.find_link('abo', exact:  false).text).to eq("labore")
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.find_link('abo', :exact => true)
+        @session.find_link('abo', exact:  true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end