capybara 2.15.0 → 3.0.0

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

@@ -1,24 +1,25 @@
 # frozen_string_literal: true
+
 require "capybara/spec/test_app"
 
 Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
   before :all do
-    @servers = 2.times.map { Capybara::Server.new(TestApp.clone).boot }
+    @servers = Array.new(2) { Capybara::Server.new(TestApp.new).boot }
     # sanity check
     expect(@servers[0].port).not_to eq(@servers[1].port)
-    expect(@servers.map { |s| s.port }).not_to include 80
+    expect(@servers.map(&:port)).not_to include 80
   end
 
   def bases
     @servers.map { |s| "http://#{s.host}:#{s.port}" }
   end
 
-  def should_be_on server_index, path="/host", scheme="http"
-    #This delay is to give fully async drivers (selenium w/chromedriver) time for the browser
-    #to get to its destination - should be removed when we have a waiting current_url matcher
-    sleep 0.1  # remove and adjust tests when a waiting current_url/path matcher is implemented
+  def should_be_on(server_index, path = "/host", scheme = "http")
     # Check that we are on /host on the given server
     s = @servers[server_index]
+
+    expect(@session).to have_current_path("#{scheme}://#{s.host}:#{s.port}#{path}", url: true)
+
     expect(@session.current_url.chomp('?')).to eq("#{scheme}://#{s.host}:#{s.port}#{path}")
     expect(@session.current_host).to eq("#{scheme}://#{s.host}") # no port
     expect(@session.current_path).to eq(path)
@@ -98,10 +99,20 @@ Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
   end
 
   it "doesn't raise exception on a nil current_url" do
+    skip "Only makes sense when there is a real driver" unless @session.respond_to?(:driver)
+    allow(@session.driver).to receive(:current_url) { nil }
     @session.visit("/")
-    allow_any_instance_of(Capybara::Session).to receive(:current_url) { nil }
-
     expect { @session.current_url }.not_to raise_exception
     expect { @session.current_path }.not_to raise_exception
   end
+
+  context "within iframe", requires: [:frames] do
+    it "should get the url of the top level browsing context" do
+      @session.visit('/within_frames')
+      expect(@session.current_url).to match(/within_frames\z/)
+      @session.within_frame('frameOne') do
+        expect(@session.current_url).to match(/within_frames\z/)
+      end
+    end
+  end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#dismiss_confirm', requires: [:modals] do
   before do
     @session.visit('/with_js')
@@ -26,7 +27,6 @@ Capybara::SpecHelper.spec '#dismiss_confirm', requires: [:modals] do
     end.to raise_error(Capybara::ModalNotFound)
   end
 
-
   it "should return the message presented" do
     message = @session.dismiss_confirm do
       @session.click_link('Open confirm')

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

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

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

@@ -31,6 +31,6 @@ Capybara::SpecHelper.spec '#assert_matches_selector' do
 
   it "should accept a filter block" do
     @element.assert_matches_selector(:css, 'span') { |el| el[:class] == "number" }
-    @element.assert_not_matches_selector(:css,'span') { |el| el[:class] == "not_number" }
+    @element.assert_not_matches_selector(:css, 'span') { |el| el[:class] == "not_number" }
   end
 end

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

@@ -20,4 +20,4 @@ Capybara::SpecHelper.spec '#match_xpath?' do
     expect(@element).not_to have_xpath("//span[@class='not_a_number']")
     expect(@element).not_to have_xpath("//div[@class='number']")
   end
-end
+end

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

@@ -52,10 +52,10 @@ Capybara::SpecHelper.spec '#match_selector?' do
   it 'should accept a custom filter block' do
     @session.visit('/form')
     cbox = @session.find(:css, '#form_pets_dog')
-    expect(cbox).to match_selector(:checkbox){ |node| node[:id] == "form_pets_dog"}
-    expect(cbox).not_to match_selector(:checkbox){ |node| node[:id] != "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
+    expect(cbox).to match_selector(:checkbox) { |node| node[:id] == "form_pets_dog" }
+    expect(cbox).not_to match_selector(:checkbox) { |node| node[:id] != "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
 
@@ -103,4 +103,4 @@ Capybara::SpecHelper.spec '#not_matches_selector?' do
     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')
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+Capybara::SpecHelper.spec "#evaluate_async_script", requires: [:js] do
+  it "should evaluate the given script and return whatever it produces" do
+    @session.visit('/with_js')
+    expect(@session.evaluate_async_script("arguments[0](4)")).to eq(4)
+  end
+
+  it "should support passing elements as arguments to the script", requires: %i[js es_args] do
+    @session.visit('/with_js')
+    el = @session.find(:css, '#drag p')
+    result = @session.evaluate_async_script("arguments[2]([arguments[0].innerText, arguments[1]])", el, "Doodle Funk")
+    expect(result).to eq ["This is a draggable element.", "Doodle Funk"]
+  end
+
+  it "should support returning elements after asynchronous operation", requires: %i[js es_args] do
+    @session.visit('/with_js')
+    @session.find(:css, '#change') # ensure page has loaded and element is available
+    el = @session.evaluate_async_script("var cb = arguments[0]; setTimeout(function(){ cb(document.getElementById('change')) }, 100)")
+    expect(el).to be_instance_of(Capybara::Node::Element)
+    expect(el).to eq(@session.find(:css, '#change'))
+  end
+end

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

@@ -1,26 +1,27 @@
 # frozen_string_literal: true
+
 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)
   end
 
-  it "should pass arguments to the script", requires: [:js, :es_args] do
+  it "should pass arguments to the script", requires: %i[js es_args] do
     @session.visit('/with_js')
     @session.evaluate_script("document.getElementById('change').textContent = arguments[0]", "Doodle Funk")
     expect(@session).to have_css('#change', text: 'Doodle Funk')
   end
 
-  it "should support passing elements as arguments to the script", requires: [:js, :es_args] do
+  it "should support passing elements as arguments to the script", requires: %i[js es_args] do
     @session.visit('/with_js')
     el = @session.find(:css, '#change')
     @session.evaluate_script("arguments[0].textContent = arguments[1]", el, "Doodle Funk")
     expect(@session).to have_css('#change', text: 'Doodle Funk')
   end
 
-  it "should support returning elements", requires: [:js, :es_args] do
+  it "should support returning elements", requires: %i[js es_args] do
     @session.visit('/with_js')
-    el = @session.find(:css, '#change')
+    @session.find(:css, '#change') # ensure page has loaded and element is available
     el = @session.evaluate_script("document.getElementById('change')")
     expect(el).to be_instance_of(Capybara::Node::Element)
     expect(el).to eq(@session.find(:css, '#change'))

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec "#execute_script", requires: [:js] do
   it "should execute the given script and return nothing" do
     @session.visit('/with_js')
@@ -8,16 +9,16 @@ Capybara::SpecHelper.spec "#execute_script", requires: [:js] do
 
   it "should be able to call functions defined in the page" do
     @session.visit('/with_js')
-    expect{ @session.execute_script("$('#change').text('Funky Doodle')") }.not_to raise_error
+    expect { @session.execute_script("$('#change').text('Funky Doodle')") }.not_to raise_error
   end
 
-  it "should pass arguments to the script", requires: [:js, :es_args] do
+  it "should pass arguments to the script", requires: %i[js es_args] do
     @session.visit('/with_js')
     @session.execute_script("document.getElementById('change').textContent = arguments[0]", "Doodle Funk")
     expect(@session).to have_css('#change', text: 'Doodle Funk')
   end
 
-  it "should support passing elements as arguments to the script", requires: [:js, :es_args] do
+  it "should support passing elements as arguments to the script", requires: %i[js es_args] do
     @session.visit('/with_js')
     el = @session.find(:css, '#change')
     @session.execute_script("arguments[1].textContent = arguments[0]", "Doodle Funk", el)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec "#fill_in" do
   before do
     @session.visit('/form')
@@ -52,6 +53,30 @@ Capybara::SpecHelper.spec "#fill_in" do
     expect(extract_results(@session)['password']).to eq('supasikrit')
   end
 
+  context "Date/Time" do
+    it "should fill in a date input" do
+      date = Date.today
+      @session.fill_in('form_date', with: date)
+      @session.click_button('awesome')
+      expect(Date.parse(extract_results(@session)['date'])).to eq date
+    end
+
+    it "should fill in a time input" do
+      time = Time.new(2018, 3, 9, 15, 26)
+      @session.fill_in('form_time', with: time)
+      @session.click_button('awesome')
+      results = extract_results(@session)['time']
+      expect(Time.parse(results).strftime('%r')).to eq time.strftime('%r')
+    end
+
+    it "should fill in a datetime input" do
+      dt = Time.new(2018, 3, 13, 9, 53)
+      @session.fill_in('form_datetime', with: dt)
+      @session.click_button('awesome')
+      expect(Time.parse(extract_results(@session)['datetime'])).to eq dt
+    end
+  end
+
   it "should handle HTML in a textarea" do
     @session.fill_in('form_description', with: 'is <strong>very</strong> secret!')
     @session.click_button('awesome')
@@ -113,7 +138,7 @@ Capybara::SpecHelper.spec "#fill_in" do
   end
 
   it "should throw an exception if a hash containing 'with' is not provided" do
-    expect {@session.fill_in 'Name', 'ignu'}.to raise_error(RuntimeError, /with/)
+    expect { @session.fill_in 'Name' }.to raise_error(ArgumentError, /with/)
   end
 
   it "should wait for asynchronous load", requires: [:js] do
@@ -123,13 +148,13 @@ Capybara::SpecHelper.spec "#fill_in" do
   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
@@ -182,14 +207,14 @@ Capybara::SpecHelper.spec "#fill_in" do
 
   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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#find_button' do
   before do
     @session.visit('/form')
@@ -22,7 +23,7 @@ Capybara::SpecHelper.spec '#find_button' do
   end
 
   it "casts to string" do
-    expect(@session.find_button(:'med')[:id]).to eq("mediocre")
+    expect(@session.find_button(:med)[:id]).to eq("mediocre")
   end
 
   it "should raise error if the button doesn't exist" do
@@ -33,12 +34,12 @@ 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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#find_by_id' do
   before do
     @session.visit('/with_html')
@@ -9,7 +10,7 @@ Capybara::SpecHelper.spec '#find_by_id' do
   end
 
   it "casts to string" do
-    expect(@session.find_by_id(:'red').tag_name).to eq('a')
+    expect(@session.find_by_id(:red).tag_name).to eq('a')
   end
 
   it "should raise error if no element with id is found" do

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#find_field' do
   before do
     @session.visit('/form')
@@ -6,7 +7,7 @@ Capybara::SpecHelper.spec '#find_field' do
 
   it "should find any 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('form_description').value).to eq('Descriptive text goes here')
     expect(@session.find_field('Region')[:name]).to eq('form[region]')
     expect(@session.find_field('With Asterisk*')).to be
   end
@@ -26,7 +27,7 @@ Capybara::SpecHelper.spec '#find_field' do
   end
 
   it "casts to string" do
-    expect(@session.find_field(:'Dog').value).to eq('dog')
+    expect(@session.find_field(:Dog).value).to eq('dog')
   end
 
   it "should raise error if the field doesn't exist" do
@@ -35,27 +36,20 @@ Capybara::SpecHelper.spec '#find_field' do
     end.to raise_error(Capybara::ElementNotFound)
   end
 
-  it "should warn if filter option is invalid" do
-    expect_any_instance_of(Kernel).to receive(:warn).
-      with('Invalid value nil passed to filter disabled - defaulting to false')
-    @session.find_field('Dog', disabled: nil)
-  end
-
-  it "should be aliased as 'field_labeled' for webrat compatibility" do
-    expect(@session.field_labeled('Dog').value).to eq('dog')
+  it "should raise error if filter option is invalid" do
     expect do
-      @session.field_labeled('Does not exist')
-    end.to raise_error(Capybara::ElementNotFound)
+      @session.find_field('Dog', disabled: nil)
+    end.to raise_error ArgumentError, "Invalid value nil passed to filter disabled"
   end
 
   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
@@ -112,6 +106,6 @@ Capybara::SpecHelper.spec '#find_field' do
 
   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"
+    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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#find_link' do
   before do
     @session.visit('/with_html')
@@ -6,13 +7,13 @@ Capybara::SpecHelper.spec '#find_link' do
 
   it "should find any link" do
     expect(@session.find_link('foo').text).to eq("ullamco")
-    expect(@session.find_link('labore')[:href]).to match %r(/with_simple_html$)
+    expect(@session.find_link('labore')[:href]).to match %r{/with_simple_html$}
   end
 
   context "aria_label attribute with Capybara.enable_aria_label" do
     it "should find when true" do
       Capybara.enable_aria_label = true
-      expect(@session.find_link('Go to simple')[:href]).to match %r(/with_simple_html$)
+      expect(@session.find_link('Go to simple')[:href]).to match %r{/with_simple_html$}
     end
 
     it "should not find when false" do
@@ -22,7 +23,7 @@ Capybara::SpecHelper.spec '#find_link' do
   end
 
   it "casts to string" do
-    expect(@session.find_link(:'foo').text).to eq("ullamco")
+    expect(@session.find_link(:foo).text).to eq("ullamco")
   end
 
   it "should raise error if the field doesn't exist" do
@@ -33,12 +34,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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#find' do
   before do
     @session.visit('/with_html')
@@ -85,6 +86,11 @@ Capybara::SpecHelper.spec '#find' do
     it "should support pseudo selectors" do
       expect(@session.find(:css, 'input:disabled').value).to eq('This is disabled')
     end
+
+    it "should support escaping characters" do
+      expect(@session.find(:css, '#\31 escape\.me').text).to eq('needs escaping')
+      expect(@session.find(:css, '.\32 escape').text).to eq('needs escaping')
+    end
   end
 
   context "with xpath selectors" do
@@ -179,17 +185,17 @@ Capybara::SpecHelper.spec '#find' do
 
     it "should allow use of filters from custom filter set" do
       expect(@session.find(:id, 'test_field', filter_set: :value, with: 'monkey').value).to eq('monkey')
-      expect{ @session.find(:id, 'test_field', filter_set: :value, with: 'not_monkey') }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.find(:id, 'test_field', filter_set: :value, with: 'not_monkey') }.to raise_error(Capybara::ElementNotFound)
     end
 
     it "should allow use of filter set from a different selector" do
       expect(@session.find(:id, 'test_field', filter_set: :field, with: 'monkey').value).to eq('monkey')
-      expect{ @session.find(:id, 'test_field', filter_set: :field, with: 'not_monkey') }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.find(:id, 'test_field', filter_set: :field, with: 'not_monkey') }.to raise_error(Capybara::ElementNotFound)
     end
 
     it "should allow importing of filter set into selector" do
       expect(@session.find(:id_with_field_filters, 'test_field', with: 'monkey').value).to eq('monkey')
-      expect{ @session.find(:id_with_field_filters, 'test_field', with: 'not_monkey') }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.find(:id_with_field_filters, 'test_field', with: 'not_monkey') }.to raise_error(Capybara::ElementNotFound)
     end
   end
 
@@ -217,15 +223,15 @@ Capybara::SpecHelper.spec '#find' do
 
   context "with :exact option" do
     it "matches exactly when true" do
-      expect(@session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("test_field")], exact:  true).value).to eq("monkey")
+      expect(@session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("test_field")], exact: true).value).to eq("monkey")
       expect do
-        @session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("est_fiel")], exact:  true)
+        @session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("est_fiel")], exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
 
     it "matches loosely when false" do
-      expect(@session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("test_field")], exact:  false).value).to eq("monkey")
-      expect(@session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("est_fiel")], exact:  false).value).to eq("monkey")
+      expect(@session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("test_field")], exact: false).value).to eq("monkey")
+      expect(@session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("est_fiel")], exact: false).value).to eq("monkey")
     end
 
     it "defaults to `Capybara.exact`" do
@@ -238,8 +244,8 @@ Capybara::SpecHelper.spec '#find' do
     end
 
     it "warns when the option has no effect" do
-      expect_any_instance_of(Kernel).to receive(:warn).
-        with('The :exact option only has an effect on queries using the XPath#is method. Using it with the query "#test_field" has no effect.')
+      expect_any_instance_of(Kernel).to receive(:warn)
+        .with('The :exact option only has an effect on queries using the XPath#is method. Using it with the query "#test_field" has no effect.')
       @session.find(:css, '#test_field', exact: true)
     end
   end
@@ -253,7 +259,7 @@ Capybara::SpecHelper.spec '#find' do
       end
       it "raises an error even if there the match is exact and the others are inexact" do
         expect do
-          @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], exact:  false, match: :one)
+          @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], exact: false, match: :one)
         end.to raise_error(Capybara::Ambiguous)
       end
       it "returns the element if there is only one" do
@@ -281,25 +287,25 @@ Capybara::SpecHelper.spec '#find' do
       context "and `exact` set to `false`" do
         it "raises an error when there are multiple exact matches" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("multiple")], match: :smart, exact:  false)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("multiple")], match: :smart, exact: false)
           end.to raise_error(Capybara::Ambiguous)
         end
         it "finds a single exact match when there also are inexact matches" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], match: :smart, exact:  false)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], match: :smart, exact: false)
           expect(result.text).to eq("almost singular")
         end
         it "raises an error when there are multiple inexact matches" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singul")], match: :smart, exact:  false)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singul")], match: :smart, exact: false)
           end.to raise_error(Capybara::Ambiguous)
         end
         it "finds a single inexact match" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :smart, exact:  false)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :smart, exact: false)
           expect(result.text).to eq("almost singular but not quite")
         end
         it "raises an error if there is no match" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], match: :smart, exact:  false)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], match: :smart, exact: false)
           end.to raise_error(Capybara::ElementNotFound)
         end
       end
@@ -307,26 +313,26 @@ Capybara::SpecHelper.spec '#find' do
       context "with `exact` set to `true`" do
         it "raises an error when there are multiple exact matches" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("multiple")], match: :smart, exact:  true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("multiple")], match: :smart, exact: true)
           end.to raise_error(Capybara::Ambiguous)
         end
         it "finds a single exact match when there also are inexact matches" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], match: :smart, exact:  true)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], match: :smart, exact: true)
           expect(result.text).to eq("almost singular")
         end
         it "raises an error when there are multiple inexact matches" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singul")], match: :smart, exact:  true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singul")], match: :smart, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
         it "raises an error when there is a single inexact matches" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :smart, exact:  true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :smart, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
         it "raises an error if there is no match" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], match: :smart, exact:  true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], match: :smart, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
       end
@@ -335,50 +341,50 @@ Capybara::SpecHelper.spec '#find' do
     context "when set to `prefer_exact`" do
       context "and `exact` set to `false`" do
         it "picks the first one when there are multiple exact matches" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("multiple")], match: :prefer_exact, exact:  false)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("multiple")], match: :prefer_exact, exact: false)
           expect(result.text).to eq("multiple one")
         end
         it "finds a single exact match when there also are inexact matches" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], match: :prefer_exact, exact:  false)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], match: :prefer_exact, exact: false)
           expect(result.text).to eq("almost singular")
         end
         it "picks the first one when there are multiple inexact matches" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singul")], match: :prefer_exact, exact:  false)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singul")], match: :prefer_exact, exact: false)
           expect(result.text).to eq("almost singular but not quite")
         end
         it "finds a single inexact match" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :prefer_exact, exact:  false)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :prefer_exact, exact: false)
           expect(result.text).to eq("almost singular but not quite")
         end
         it "raises an error if there is no match" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], match: :prefer_exact, exact:  false)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], match: :prefer_exact, exact: false)
           end.to raise_error(Capybara::ElementNotFound)
         end
       end
 
       context "with `exact` set to `true`" do
         it "picks the first one when there are multiple exact matches" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("multiple")], match: :prefer_exact, exact:  true)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("multiple")], match: :prefer_exact, exact: true)
           expect(result.text).to eq("multiple one")
         end
         it "finds a single exact match when there also are inexact matches" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], match: :prefer_exact, exact:  true)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], match: :prefer_exact, exact: true)
           expect(result.text).to eq("almost singular")
         end
         it "raises an error if there are multiple inexact matches" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singul")], match: :prefer_exact, exact:  true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singul")], match: :prefer_exact, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
         it "raises an error if there is a single inexact match" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :prefer_exact, exact:  true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :prefer_exact, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
         it "raises an error if there is no match" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], match: :prefer_exact, exact:  true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], match: :prefer_exact, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
       end
@@ -401,7 +407,7 @@ Capybara::SpecHelper.spec '#find' do
   end
 
   it "supports a custom filter block" do
-    expect(@session.find(:css, 'input'){|node| node.disabled? }[:name]).to eq('disabled_text')
+    expect(@session.find(:css, 'input', &:disabled?)[:name]).to eq('disabled_text')
   end
 
   context "within a scope" do