capybara 2.9.0 → 2.10.0

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

@@ -14,15 +14,15 @@ Capybara::SpecHelper.spec '#find' do
   end
 
   it "should find the first element using the given locator and options" do
-    expect(@session.find('//a', :text => 'Redirect')[:id]).to eq('red')
-    expect(@session.find(:css, 'a', :text => 'A link came first')[:title]).to eq('twas a fine link')
+    expect(@session.find('//a', text: 'Redirect')[:id]).to eq('red')
+    expect(@session.find(:css, 'a', text: 'A link came first')[:title]).to eq('twas a fine link')
   end
 
   it "should raise an error if there are multiple matches" do
     expect { @session.find('//a') }.to raise_error(Capybara::Ambiguous)
   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')
     expect(@session.find(:css, "a#has-been-clicked").text).to include('Has been clicked')
@@ -34,12 +34,12 @@ Capybara::SpecHelper.spec '#find' do
     end
   end
 
-  context "with :wait option", :requires => [:js] do
+  context "with :wait option", requires: [:js] do
     it "should not wait for asynchronous load when `false` given" do
       @session.visit('/with_js')
       @session.click_link('Click me')
       expect do
-        @session.find(:css, "a#has-been-clicked", :wait => false)
+        @session.find(:css, "a#has-been-clicked", wait: false)
       end.to raise_error(Capybara::ElementNotFound)
     end
 
@@ -47,18 +47,18 @@ Capybara::SpecHelper.spec '#find' do
       @session.visit('/with_js')
       @session.click_link('Slowly')
       expect do
-        @session.find(:css, "a#slow-clicked", :wait => 0.2)
+        @session.find(:css, "a#slow-clicked", wait: 0.2)
       end.to raise_error(Capybara::ElementNotFound)
     end
 
     it "should find element if it appears before given wait duration" do
       @session.visit('/with_js')
       @session.click_link('Click me')
-      expect(@session.find(:css, "a#has-been-clicked", :wait => 0.9).text).to include('Has been clicked')
+      expect(@session.find(:css, "a#has-been-clicked", wait: 0.9).text).to include('Has been clicked')
     end
   end
 
-  context "with frozen time", :requires => [:js] do
+  context "with frozen time", requires: [:js] do
     if defined?(Process::CLOCK_MONOTONIC)
       it "will time out even if time is frozen" do
         @session.visit('/with_js')
@@ -126,8 +126,8 @@ Capybara::SpecHelper.spec '#find' do
     end
 
     it "should find elements that match the filter" do
-      expect(@session.find(:beatle, 'Paul', :type => 'drummer').text).to eq('Paul')
-      expect(@session.find(:beatle, 'Ringo', :type => 'drummer').text).to eq('Ringo')
+      expect(@session.find(:beatle, 'Paul', type: 'drummer').text).to eq('Paul')
+      expect(@session.find(:beatle, 'Ringo', type: 'drummer').text).to eq('Ringo')
     end
 
     it "ignores filter when it is not given" do
@@ -136,8 +136,8 @@ Capybara::SpecHelper.spec '#find' do
     end
 
     it "should not find elements that don't match the filter" do
-      expect { @session.find(:beatle, 'John', :type => 'drummer') }.to raise_error(Capybara::ElementNotFound)
-      expect { @session.find(:beatle, 'George', :type => 'drummer') }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.find(:beatle, 'John', type: 'drummer') }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.find(:beatle, 'George', type: 'drummer') }.to raise_error(Capybara::ElementNotFound)
     end
   end
 
@@ -145,13 +145,13 @@ Capybara::SpecHelper.spec '#find' do
     before do
       Capybara.add_selector(:beatle) do
         xpath { |name| ".//li[contains(@class, 'beatle')][contains(text(), '#{name}')]" }
-        filter(:type, :default => "drummer") { |node, type| node[:class].split(/\s+/).include?(type) }
+        filter(:type, default: "drummer") { |node, type| node[:class].split(/\s+/).include?(type) }
       end
     end
 
     it "should find elements that match the filter" do
-      expect(@session.find(:beatle, 'Paul', :type => 'drummer').text).to eq('Paul')
-      expect(@session.find(:beatle, 'Ringo', :type => 'drummer').text).to eq('Ringo')
+      expect(@session.find(:beatle, 'Paul', type: 'drummer').text).to eq('Paul')
+      expect(@session.find(:beatle, 'Ringo', type: 'drummer').text).to eq('Ringo')
     end
 
     it "should use default value when filter is not given" do
@@ -160,8 +160,8 @@ Capybara::SpecHelper.spec '#find' do
     end
 
     it "should not find elements that don't match the filter" do
-      expect { @session.find(:beatle, 'John', :type => 'drummer') }.to raise_error(Capybara::ElementNotFound)
-      expect { @session.find(:beatle, 'George', :type => 'drummer') }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.find(:beatle, 'John', type: 'drummer') }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.find(:beatle, 'George', type: 'drummer') }.to raise_error(Capybara::ElementNotFound)
     end
   end
 
@@ -216,15 +216,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
@@ -247,31 +247,31 @@ Capybara::SpecHelper.spec '#find' do
     context "when set to `one`" do
       it "raises an error when multiple matches exist" do
         expect do
-          @session.find(:css, ".multiple", :match => :one)
+          @session.find(:css, ".multiple", match: :one)
         end.to raise_error(Capybara::Ambiguous)
       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
-        expect(@session.find(:css, ".singular", :match => :one).text).to eq("singular")
+        expect(@session.find(:css, ".singular", match: :one).text).to eq("singular")
       end
       it "raises an error if there is no match" do
         expect do
-          @session.find(:css, ".does-not-exist", :match => :one)
+          @session.find(:css, ".does-not-exist", match: :one)
         end.to raise_error(Capybara::ElementNotFound)
       end
     end
 
     context "when set to `first`" do
       it "returns the first matched element" do
-        expect(@session.find(:css, ".multiple", :match => :first).text).to eq("multiple one")
+        expect(@session.find(:css, ".multiple", match: :first).text).to eq("multiple one")
       end
       it "raises an error if there is no match" do
         expect do
-          @session.find(:css, ".does-not-exist", :match => :first)
+          @session.find(:css, ".does-not-exist", match: :first)
         end.to raise_error(Capybara::ElementNotFound)
       end
     end
@@ -280,25 +280,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
@@ -306,26 +306,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
-            result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], :match => :smart, :exact => true)
+            result = @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
@@ -334,50 +334,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
@@ -394,11 +394,15 @@ Capybara::SpecHelper.spec '#find' do
 
     it "raises an error when unknown option given" do
       expect do
-        @session.find(:css, ".singular", :match => :schmoo)
+        @session.find(:css, ".singular", match: :schmoo)
       end.to raise_error(ArgumentError)
     end
   end
 
+  it "supports a custom filter block" do
+    expect(@session.find(:css, 'input'){|node| node.disabled? }[:name]).to eq('disabled_text')
+  end
+
   context "within a scope" do
     before do
       @session.visit('/with_scope')
@@ -416,4 +420,9 @@ Capybara::SpecHelper.spec '#find' do
       end
     end
   end
+
+  it "should warn if selector type is unknown" do
+    expect_any_instance_of(Kernel).to receive(:warn).with(/^Unknown selector type/)
+    @session.find(:unknown, '//h1')
+  end
 end

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

@@ -43,27 +43,27 @@ Capybara::SpecHelper.spec '#first' do
 
   context "with visible filter" do
     it "should only find visible nodes when true" do
-      expect(@session.first(:css, "a#invisible", :visible => true)).to be_nil
+      expect(@session.first(:css, "a#invisible", visible: true)).to be_nil
     end
 
     it "should find nodes regardless of whether they are invisible when false" do
-      expect(@session.first(:css, "a#invisible", :visible => false)).not_to be_nil
-      expect(@session.first(:css, "a#visible", :visible => false)).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: false)).not_to be_nil
+      expect(@session.first(:css, "a#visible", visible: false)).not_to be_nil
     end
 
     it "should find nodes regardless of whether they are invisible when :all" do
-      expect(@session.first(:css, "a#invisible", :visible => :all)).not_to be_nil
-      expect(@session.first(:css, "a#visible", :visible => :all)).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :all)).not_to be_nil
+      expect(@session.first(:css, "a#visible", visible: :all)).not_to be_nil
     end
 
     it "should find only hidden nodes when :hidden" do
-      expect(@session.first(:css, "a#invisible", :visible => :hidden)).not_to be_nil
-      expect(@session.first(:css, "a#visible", :visible => :hidden)).to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :hidden)).not_to be_nil
+      expect(@session.first(:css, "a#visible", visible: :hidden)).to be_nil
     end
 
     it "should find only visible nodes when :visible" do
-      expect(@session.first(:css, "a#invisible", :visible => :visible)).to be_nil
-      expect(@session.first(:css, "a#visible", :visible => :visible)).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :visible)).to be_nil
+      expect(@session.first(:css, "a#visible", visible: :visible)).not_to be_nil
     end
 
     it "should default to Capybara.ignore_hidden_elements" do

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-Capybara::SpecHelper.spec '#go_back', :requires => [:js] do
+Capybara::SpecHelper.spec '#go_back', requires: [:js] do
   it "should fetch a response from the driver from the previous page" do
     @session.visit('/')
     expect(@session).to have_content('Hello world!')

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-Capybara::SpecHelper.spec '#go_forward', :requires => [:js] do
+Capybara::SpecHelper.spec '#go_forward', requires: [:js] do
   it "should fetch a response from the driver from the previous page" do
     @session.visit('/')
     expect(@session).to have_content('Hello world!')

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

@@ -10,8 +10,8 @@ Capybara::SpecHelper.spec '#has_button?' do
     expect(@session).to have_button(:'crap321')
   end
 
-  it "should be true for disabled buttons if :disabled => true" do
-    expect(@session).to have_button('Disabled button', :disabled => true)
+  it "should be true for disabled buttons if disabled: true" do
+    expect(@session).to have_button('Disabled button', disabled: true)
   end
 
   it "should be false if the given button is not on the page" do
@@ -22,16 +22,16 @@ Capybara::SpecHelper.spec '#has_button?' do
     expect(@session).not_to have_button('Disabled button')
   end
 
-  it "should be false for disabled buttons if :disabled => false" do
-    expect(@session).not_to have_button('Disabled button', :disabled => false)
+  it "should be false for disabled buttons if disabled: false" do
+    expect(@session).not_to have_button('Disabled button', disabled: false)
   end
 
-  it "should be true for disabled buttons if :disabled => :all" do
-    expect(@session).to have_button('Disabled button', :disabled => :all)
+  it "should be true for disabled buttons if disabled: :all" do
+    expect(@session).to have_button('Disabled button', disabled: :all)
   end
 
-  it "should be true for enabled buttons if :disabled => :all" do
-    expect(@session).to have_button('med', :disabled => :all)
+  it "should be true for enabled buttons if disabled: :all" do
+    expect(@session).to have_button('med', disabled: :all)
   end
 end
 
@@ -45,8 +45,8 @@ Capybara::SpecHelper.spec '#has_no_button?' do
     expect(@session).not_to have_no_button('crap321')
   end
 
-  it "should be true for disabled buttons if :disabled => true" do
-    expect(@session).not_to have_no_button('Disabled button', :disabled => true)
+  it "should be true for disabled buttons if disabled: true" do
+    expect(@session).not_to have_no_button('Disabled button', disabled: true)
   end
 
   it "should be false if the given button is not on the page" do
@@ -57,7 +57,7 @@ Capybara::SpecHelper.spec '#has_no_button?' do
     expect(@session).to have_no_button('Disabled button')
   end
 
-  it "should be false for disabled buttons if :disabled => false" do
-    expect(@session).to have_no_button('Disabled button', :disabled => false)
+  it "should be false for disabled buttons if disabled: false" do
+    expect(@session).to have_no_button('Disabled button', disabled: false)
   end
 end