capybara 2.18.0 → 3.0.0.rc1

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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#first' do
   before do
     @session.visit('/with_html')
@@ -9,8 +10,16 @@ Capybara::SpecHelper.spec '#first' do
     expect(@session.first("//input[@id='test_field']").value).to eq('monkey')
   end
 
-  it "should return nil when nothing was found" do
-    expect(@session.first('//div[@id="nosuchthing"]')).to be_nil
+  it "should raise ElementNotFound when nothing was found" do
+    expect do
+      @session.first('//div[@id="nosuchthing"]')
+    end.to raise_error Capybara::ElementNotFound
+  end
+
+  it "should return nil when nothing was found if count options allow no results" do
+    expect(@session.first('//div[@id="nosuchthing"]', minimum: 0)).to be_nil
+    expect(@session.first('//div[@id="nosuchthing"]', count: 0)).to be_nil
+    expect(@session.first('//div[@id="nosuchthing"]', between: (0..3))).to be_nil
   end
 
   it "should accept an XPath instance" do
@@ -20,9 +29,10 @@ Capybara::SpecHelper.spec '#first' do
     expect(@session.first(@xpath).value).to eq('John')
   end
 
-  it "should warn when unused parameters are passed" do
-    expect_any_instance_of(Kernel).to receive(:warn).with(/Unused parameters passed.*unused text/)
-    @session.first(:css, '.header h2', 'unused text')
+  it "should raise when unused parameters are passed" do
+    expect do
+      @session.first(:css, 'h1', 'unused text')
+    end.to raise_error ArgumentError, /Unused parameters passed.*unused text/
   end
 
   context "with css selectors" do
@@ -49,40 +59,52 @@ 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 do
+        @session.first(:css, "a#invisible", visible: true)
+      end.to raise_error Capybara::ElementNotFound
     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#invisible", visible: false, text: 'hidden link')).not_to be_nil
-      expect(@session.first(:css, "a#visible", visible: false)).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: false)).to be
+      expect(@session.first(:css, "a#invisible", visible: false, text: 'hidden link')).to be
+      expect(@session.first(:css, "a#visible", visible: false)).to be
     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#invisible", visible: :all, text: 'hidden link')).not_to be_nil
-      expect(@session.first(:css, "a#visible", visible: :all)).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :all)).to be
+      expect(@session.first(:css, "a#invisible", visible: :all, text: 'hidden link')).to be
+      expect(@session.first(:css, "a#visible", visible: :all)).to be
     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#invisible", visible: :hidden, text: 'hidden link')).not_to be_nil
-      expect(@session.first(:css, "a#invisible", visible: :hidden, text: 'not hidden link')).to be_nil
-      expect(@session.first(:css, "a#visible", visible: :hidden)).to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :hidden)).to be
+      expect(@session.first(:css, "a#invisible", visible: :hidden, text: 'hidden link')).to be
+      expect do
+        @session.first(:css, "a#invisible", visible: :hidden, text: 'not hidden link')
+      end.to raise_error Capybara::ElementNotFound
+      expect do
+        @session.first(:css, "a#visible", visible: :hidden)
+      end.to raise_error Capybara::ElementNotFound
     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#invisible", visible: :visible, text: 'hidden link')).to be_nil
-      expect(@session.first(:css, "a#visible", visible: :visible)).not_to be_nil
+      expect do
+        @session.first(:css, "a#invisible", visible: :visible)
+      end.to raise_error Capybara::ElementNotFound
+      expect do
+        @session.first(:css, "a#invisible", visible: :visible, text: 'hidden link')
+      end.to raise_error Capybara::ElementNotFound
+      expect(@session.first(:css, "a#visible", visible: :visible)).to be
     end
 
     it "should default to Capybara.ignore_hidden_elements" do
       Capybara.ignore_hidden_elements = true
-      expect(@session.first(:css, "a#invisible")).to be_nil
+      expect do
+        @session.first(:css, "a#invisible")
+      end.to raise_error Capybara::ElementNotFound
       Capybara.ignore_hidden_elements = false
-      expect(@session.first(:css, "a#invisible")).not_to be_nil
-      expect(@session.first(:css, "a")).not_to be_nil
+      expect(@session.first(:css, "a#invisible")).to be
+      expect(@session.first(:css, "a")).to be
     end
   end
 
@@ -93,35 +115,40 @@ Capybara::SpecHelper.spec '#first' do
 
     it "should find the first element using the given locator" do
       @session.within(:xpath, "//div[@id='for_bar']") do
-        expect(@session.first('.//form')).not_to be_nil
+        expect(@session.first('.//form')).to be
       end
     end
   end
 
-  context "with Capybara.wait_on_first_by_default", requires: [:js] do
+  context "waiting behavior", requires: [:js] do
     before do
       @session.visit('/with_js')
     end
 
-    it "should not wait if false" do
-      Capybara.wait_on_first_by_default = false
+    it "should not wait if minimum: 0" do
       @session.click_link('clickable')
-      expect(@session.first(:css, 'a#has-been-clicked')).to be_nil
+      Capybara.using_wait_time(3) do
+        start_time = Time.now
+        expect(@session.first(:css, 'a#has-been-clicked', minimum: 0)).to be_nil
+        expect(Time.now - start_time).to be < 3
+      end
     end
 
-    it "should wait for at least one match if true" do
-      Capybara.wait_on_first_by_default = true
+    it "should wait for at least one match by default" do
       Capybara.using_wait_time(3) do
         @session.click_link('clickable')
         expect(@session.first(:css, 'a#has-been-clicked')).not_to be_nil
       end
     end
 
-    it "should return nil after waiting if no match" do
-      Capybara.wait_on_first_by_default = true
+    it "should raise an error after waiting if no match" do
+      @session.click_link('clickable')
       Capybara.using_wait_time(3) do
-        @session.click_link('clickable')
-        expect(@session.first(:css, 'a#not-a-real-link')).to be_nil
+        start_time = Time.now
+        expect do
+          @session.first(:css, 'a#not-a-real-link')
+        end.to raise_error Capybara::ElementNotFound
+        expect(Time.now - start_time).to be > 3
       end
     end
   end

data/lib/capybara/spec/session/frame/switch_to_frame_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#switch_to_frame', requires: [:frames] do
   before(:each) do
     @session.visit('/within_frames')
@@ -47,7 +48,7 @@ Capybara::SpecHelper.spec '#switch_to_frame', requires: [:frames] do
     end
   end
 
-  it "works if the frame is closed", requires: [:frames, :js] do
+  it "works if the frame is closed", requires: %i[frames js] do
     frame = @session.find(:frame, 'parentFrame')
     @session.switch_to_frame frame
     frame = @session.find(:frame, 'childFrame')

data/lib/capybara/spec/session/frame/within_frame_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#within_frame', requires: [:frames] do
   before(:each) do
     @session.visit('/within_frames')
@@ -56,21 +57,25 @@ Capybara::SpecHelper.spec '#within_frame', requires: [:frames] do
   it "should find multiple nested frames" do
     @session.within_frame 'parentFrame' do
       @session.within_frame 'childFrame' do
-        @session.within_frame 'grandchildFrame1' do end
-        @session.within_frame 'grandchildFrame2' do end
+        @session.within_frame 'grandchildFrame1' do
+          # dummy
+        end
+        @session.within_frame 'grandchildFrame2' do
+          # dummy
+        end
       end
     end
   end
 
   it "should reset scope when changing frames" do
     @session.within(:css, '#divInMainWindow') do
-      @session.within_frame 'parentFrame' do
+      @session.within_frame 'innerParentFrame' do
         expect(@session.has_selector?(:css, "iframe#childFrame")).to be true
       end
     end
   end
 
-  it "works if the frame is closed", requires: [:frames, :js] do
+  it "works if the frame is closed", requires: %i[frames js] do
     @session.within_frame 'parentFrame' do
       @session.within_frame 'childFrame' do
         @session.click_link 'Close Window'
@@ -79,16 +84,4 @@ Capybara::SpecHelper.spec '#within_frame', requires: [:frames] do
       expect(@session).not_to have_selector(:css, '#childFrame')
     end
   end
-
-  it "should support the driver #switch_to_frame api" do
-    # This test is purely to notify driver authors to update their API.
-    # The #switch_to_frame API will be required in the next version (> 2.8) of Capybara for frames support.
-    # It should not be used as an example of code for users.
-    frame = @session.find(:frame, "frameOne")
-    expect {
-      @session.driver.switch_to_frame(frame)
-      sleep 0.5
-      @session.driver.switch_to_frame(:parent)
-    }.not_to raise_error
-  end
 end

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

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

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

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

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

@@ -1,52 +1,53 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#have_all_selectors' do
   before do
     @session.visit('/with_html')
   end
 
   it "should be true if the given selectors are on the page" do
-    expect(@session).to have_all_of_selectors(:css, "p a#foo", "h2#h2one", "h2#h2two" )
+    expect(@session).to have_all_of_selectors(:css, "p a#foo", "h2#h2one", "h2#h2two")
   end
 
   it "should be false if any of the given selectors are not on the page" do
-    expect {
+    expect do
       expect(@session).to have_all_of_selectors(:css, "p a#foo", "h2#h2three", "h2#h2one")
-    }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
   end
 
   it "should use default selector" do
     Capybara.default_selector = :css
-    expect(@session).to have_all_of_selectors("p a#foo", "h2#h2two", "h2#h2one" )
-    expect {
+    expect(@session).to have_all_of_selectors("p a#foo", "h2#h2two", "h2#h2one")
+    expect do
       expect(@session).to have_all_of_selectors("p a#foo", "h2#h2three", "h2#h2one")
-    }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
   end
 
   context "should respect scopes" do
     it "when used with `within`" do
       @session.within "//p[@id='first']" do
         expect(@session).to have_all_of_selectors(".//a[@id='foo']")
-        expect {
+        expect do
           expect(@session).to have_all_of_selectors(".//a[@id='red']")
-        }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+        end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
       end
     end
 
     it "when called on elements" do
       el = @session.find "//p[@id='first']"
       expect(el).to have_all_of_selectors(".//a[@id='foo']")
-      expect {
+      expect do
         expect(el).to have_all_of_selectors(".//a[@id='red']")
-      }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
     end
   end
 
   context "with options" do
     it "should apply options to all locators" do
       expect(@session).to have_all_of_selectors(:field, 'normal', 'additional_newline', type: :textarea)
-      expect {
+      expect do
         expect(@session).to have_all_of_selectors(:field, 'normal', 'test_field', 'additional_newline', type: :textarea)
-      }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
     end
   end
 
@@ -61,9 +62,8 @@ Capybara::SpecHelper.spec '#have_all_selectors' do
   end
 
   it "cannot be negated" do
-    expect {
+    expect do
       expect(@session).not_to have_all_of_selectors(:css, "p a#foo", "h2#h2one", "h2#h2two")
-    }.to raise_error ArgumentError
+    end.to raise_error ArgumentError
   end
 end
-