capybara 2.2.1 → 2.3.0

data/spec/result_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Capybara::Result do
+RSpec.describe Capybara::Result do
   let :string do
     Capybara.string <<-STRING
       <ul>
@@ -17,7 +17,7 @@ describe Capybara::Result do
   end
 
   it "has a length" do
-    result.length.should == 4
+    expect(result.length).to eq(4)
   end
 
   it "has a first element" do
@@ -29,37 +29,37 @@ describe Capybara::Result do
   end
 
   it 'can supports values_at method' do
-    result.values_at(0, 2).map(&:text).should == %w(Alpha Gamma)
+    expect(result.values_at(0, 2).map(&:text)).to eq(%w(Alpha Gamma))
   end
 
   it "can return an element by its index" do
-    result.at(1).text.should == 'Beta'
-    result[2].text.should == 'Gamma'
+    expect(result.at(1).text).to eq('Beta')
+    expect(result[2].text).to eq('Gamma')
   end
 
   it "can be mapped" do
-    result.map(&:text).should == %w(Alpha Beta Gamma Delta)
+    expect(result.map(&:text)).to eq(%w(Alpha Beta Gamma Delta))
   end
 
   it "can be selected" do
-    result.select do |element|
+    expect(result.select do |element|
       element.text.include? 't'
-    end.length.should == 2
+    end.length).to eq(2)
   end
 
   it "can be reduced" do
-    result.reduce('') do |memo, element|
+    expect(result.reduce('') do |memo, element|
       memo += element.text[0]
-    end.should == 'ABGD'
+    end).to eq('ABGD')
   end
 
   it 'can be sampled' do
-    result.should include(result.sample)
+    expect(result).to include(result.sample)
   end
 
   it 'can be indexed' do
-    result.index do |el|
+    expect(result.index do |el|
       el.text == 'Gamma'
-    end.should == 2
+    end).to eq(2)
   end
 end

data/spec/rspec/features_spec.rb

@@ -5,48 +5,53 @@ RSpec.configuration.before(:each, :example_group => {:file_path => "./spec/rspec
   @in_filtered_hook = true
 end
 
-feature "Capybara's feature DSL" do
+feature "Capybara's feature DSL" do    
   background do
     @in_background = true
   end
+  
+  def current_example(context)
+    RSpec.respond_to?(:current_example) ? RSpec.current_example : context.example
+  end
 
   scenario "includes Capybara" do
     visit('/')
-    page.should have_content('Hello world!')
+    expect(page).to have_content('Hello world!')
   end
 
-  scenario "preserves description" do
-    example.metadata[:full_description].should == "Capybara's feature DSL preserves description"
+  scenario "preserves description" do 
+    expect(current_example(self).metadata[:full_description])
+      .to eq("Capybara's feature DSL preserves description")
   end
 
   scenario "allows driver switching", :driver => :selenium do
-    Capybara.current_driver.should == :selenium
+    expect(Capybara.current_driver).to eq(:selenium)
   end
 
   scenario "runs background" do
-    @in_background.should be_true
+    expect(@in_background).to be_truthy
   end
 
   scenario "runs hooks filtered by file path" do
-    @in_filtered_hook.should be_true
+    expect(@in_filtered_hook).to be_truthy
   end
 
   scenario "doesn't pollute the Object namespace" do
-    Object.new.respond_to?(:feature, true).should be_false
+    expect(Object.new.respond_to?(:feature, true)).to be_falsey
   end
 
   feature 'nested features' do
     scenario 'work as expected' do
       visit '/'
-      page.should have_content 'Hello world!'
+      expect(page).to have_content 'Hello world!'
     end
 
     scenario 'are marked in the metadata as capybara_feature' do
-      example.metadata[:capybara_feature].should be_true
+      expect(current_example(self).metadata[:capybara_feature]).to be_truthy
     end
 
     scenario 'have a type of :feature' do
-      example.metadata[:type].should eq :feature
+      expect(current_example(self).metadata[:type]).to eq :feature
     end
   end
 end
@@ -56,12 +61,12 @@ feature "given and given! aliases to let and let!" do
   given!(:value_in_background) { :available }
 
   background do
-    value_in_background.should be(:available)
+    expect(value_in_background).to be(:available)
   end
 
   scenario "given and given! work as intended" do
-    value.should be(:available)
-    value_in_background.should be(:available)
+    expect(value).to be(:available)
+    expect(value_in_background).to be(:available)
   end
 end
 
@@ -72,6 +77,6 @@ end
 
 feature "Capybara's feature DSL with driver", :driver => :culerity do
   scenario "switches driver" do
-    Capybara.current_driver.should == :culerity
+    expect(Capybara.current_driver).to eq(:culerity)
   end
 end

data/spec/rspec/matchers_spec.rb

@@ -2,52 +2,52 @@ require 'spec_helper'
 require 'capybara/dsl'
 require 'capybara/rspec/matchers'
 
-describe Capybara::RSpecMatchers do
+RSpec.describe Capybara::RSpecMatchers do
   include Capybara::DSL
   include Capybara::RSpecMatchers
 
   describe "have_css matcher" do
     it "gives proper description" do
-      have_css('h1').description.should == "have css \"h1\""
+      expect(have_css('h1').description).to eq("have css \"h1\"")
     end
 
     context "on a string" do
       context "with should" do
         it "passes if has_css? returns true" do
-          "<h1>Text</h1>".should have_css('h1')
+          expect("<h1>Text</h1>").to have_css('h1')
         end
 
         it "fails if has_css? returns false" do
           expect do
-            "<h1>Text</h1>".should have_css('h2')
+            expect("<h1>Text</h1>").to have_css('h2')
           end.to raise_error(/expected to find css "h2" but there were no matches/)
         end
 
         it "passes if matched node count equals expected count" do
-          "<h1>Text</h1>".should have_css('h1', :count => 1)
+          expect("<h1>Text</h1>").to have_css('h1', :count => 1)
         end
 
         it "fails if matched node count does not equal expected count" do
           expect do
-            "<h1>Text</h1>".should have_css('h1', count: 2)
+            expect("<h1>Text</h1>").to have_css('h1', count: 2)
           end.to raise_error("expected to find css \"h1\" 2 times, found 1 match: \"Text\"")
         end
 
         it "fails if matched node count is less than expected minimum count" do
           expect do
-            "<h1>Text</h1>".should have_css('p', minimum: 1)
+            expect("<h1>Text</h1>").to have_css('p', minimum: 1)
           end.to raise_error("expected to find css \"p\" at least 1 time but there were no matches")
         end
 
         it "fails if matched node count is more than expected maximum count" do
           expect do
-            "<h1>Text</h1><h1>Text</h1><h1>Text</h1>".should have_css('h1', maximum: 2)
+            expect("<h1>Text</h1><h1>Text</h1><h1>Text</h1>").to have_css('h1', maximum: 2)
           end.to raise_error('expected to find css "h1" at most 2 times, found 3 matches: "Text", "Text", "Text"')
         end
 
         it "fails if matched node count does not belong to expected range" do
           expect do
-            "<h1>Text</h1>".should have_css('h1', between: 2..3)
+            expect("<h1>Text</h1>").to have_css('h1', between: 2..3)
           end.to raise_error("expected to find css \"h1\" between 2 and 3 times, found 1 match: \"Text\"")
         end
 
@@ -55,22 +55,22 @@ describe Capybara::RSpecMatchers do
 
       context "with should_not" do
         it "passes if has_no_css? returns true" do
-          "<h1>Text</h1>".should_not have_css('h2')
+          expect("<h1>Text</h1>").not_to have_css('h2')
         end
 
         it "fails if has_no_css? returns false" do
           expect do
-            "<h1>Text</h1>".should_not have_css('h1')
+            expect("<h1>Text</h1>").not_to have_css('h1')
           end.to raise_error(/expected not to find css "h1"/)
         end
 
         it "passes if matched node count does not equal expected count" do
-          "<h1>Text</h1>".should_not have_css('h1', :count => 2)
+          expect("<h1>Text</h1>").not_to have_css('h1', :count => 2)
         end
 
         it "fails if matched node count equals expected count" do
           expect do
-            "<h1>Text</h1>".should_not have_css('h1', :count => 1)
+            expect("<h1>Text</h1>").not_to have_css('h1', :count => 1)
           end.to raise_error(/expected not to find css "h1"/)
         end
       end
@@ -83,24 +83,24 @@ describe Capybara::RSpecMatchers do
 
       context "with should" do
         it "passes if has_css? returns true" do
-          page.should have_css('h1')
+          expect(page).to have_css('h1')
         end
 
         it "fails if has_css? returns false" do
           expect do
-            page.should have_css('h1#doesnotexist')
+            expect(page).to have_css('h1#doesnotexist')
           end.to raise_error(/expected to find css "h1#doesnotexist" but there were no matches/)
         end
       end
 
       context "with should_not" do
         it "passes if has_no_css? returns true" do
-          page.should_not have_css('h1#doesnotexist')
+          expect(page).not_to have_css('h1#doesnotexist')
         end
 
         it "fails if has_no_css? returns false" do
           expect do
-            page.should_not have_css('h1')
+            expect(page).not_to have_css('h1')
           end.to raise_error(/expected not to find css "h1"/)
         end
       end
@@ -109,30 +109,30 @@ describe Capybara::RSpecMatchers do
 
   describe "have_xpath matcher" do
     it "gives proper description" do
-      have_xpath('//h1').description.should == "have xpath \"\/\/h1\""
+      expect(have_xpath('//h1').description).to eq("have xpath \"\/\/h1\"")
     end
 
     context "on a string" do
       context "with should" do
         it "passes if has_xpath? returns true" do
-          "<h1>Text</h1>".should have_xpath('//h1')
+          expect("<h1>Text</h1>").to have_xpath('//h1')
         end
 
         it "fails if has_xpath? returns false" do
           expect do
-            "<h1>Text</h1>".should have_xpath('//h2')
+            expect("<h1>Text</h1>").to have_xpath('//h2')
           end.to raise_error(%r(expected to find xpath "//h2" but there were no matches))
         end
       end
 
       context "with should_not" do
         it "passes if has_no_xpath? returns true" do
-          "<h1>Text</h1>".should_not have_xpath('//h2')
+          expect("<h1>Text</h1>").not_to have_xpath('//h2')
         end
 
         it "fails if has_no_xpath? returns false" do
           expect do
-            "<h1>Text</h1>".should_not have_xpath('//h1')
+            expect("<h1>Text</h1>").not_to have_xpath('//h1')
           end.to raise_error(%r(expected not to find xpath "//h1"))
         end
       end
@@ -145,24 +145,24 @@ describe Capybara::RSpecMatchers do
 
       context "with should" do
         it "passes if has_xpath? returns true" do
-          page.should have_xpath('//h1')
+          expect(page).to have_xpath('//h1')
         end
 
         it "fails if has_xpath? returns false" do
           expect do
-            page.should have_xpath("//h1[@id='doesnotexist']")
+            expect(page).to have_xpath("//h1[@id='doesnotexist']")
           end.to raise_error(%r(expected to find xpath "//h1\[@id='doesnotexist'\]" but there were no matches))
         end
       end
 
       context "with should_not" do
         it "passes if has_no_xpath? returns true" do
-          page.should_not have_xpath('//h1[@id="doesnotexist"]')
+          expect(page).not_to have_xpath('//h1[@id="doesnotexist"]')
         end
 
         it "fails if has_no_xpath? returns false" do
           expect do
-            page.should_not have_xpath('//h1')
+            expect(page).not_to have_xpath('//h1')
           end.to raise_error(%r(expected not to find xpath "//h1"))
         end
       end
@@ -172,31 +172,31 @@ describe Capybara::RSpecMatchers do
   describe "have_selector matcher" do
     it "gives proper description" do
       matcher = have_selector('//h1')
-      "<h1>Text</h1>".should matcher
-      matcher.description.should == "have xpath \"//h1\""
+      expect("<h1>Text</h1>").to matcher
+      expect(matcher.description).to eq("have xpath \"//h1\"")
     end
 
     context "on a string" do
       context "with should" do
         it "passes if has_selector? returns true" do
-          "<h1>Text</h1>".should have_selector('//h1')
+          expect("<h1>Text</h1>").to have_selector('//h1')
         end
 
         it "fails if has_selector? returns false" do
           expect do
-            "<h1>Text</h1>".should have_selector('//h2')
+            expect("<h1>Text</h1>").to have_selector('//h2')
           end.to raise_error(%r(expected to find xpath "//h2" but there were no matches))
         end
       end
 
       context "with should_not" do
         it "passes if has_no_selector? returns true" do
-          "<h1>Text</h1>".should_not have_selector(:css, 'h2')
+          expect("<h1>Text</h1>").not_to have_selector(:css, 'h2')
         end
 
         it "fails if has_no_selector? returns false" do
           expect do
-            "<h1>Text</h1>".should_not have_selector(:css, 'h1')
+            expect("<h1>Text</h1>").not_to have_selector(:css, 'h1')
           end.to raise_error(%r(expected not to find css "h1"))
         end
       end
@@ -209,30 +209,30 @@ describe Capybara::RSpecMatchers do
 
       context "with should" do
         it "passes if has_selector? returns true" do
-          page.should have_selector('//h1', :text => 'test')
+          expect(page).to have_selector('//h1', :text => 'test')
         end
 
         it "fails if has_selector? returns false" do
           expect do
-            page.should have_selector("//h1[@id='doesnotexist']")
+            expect(page).to have_selector("//h1[@id='doesnotexist']")
           end.to raise_error(%r(expected to find xpath "//h1\[@id='doesnotexist'\]" but there were no matches))
         end
 
         it "includes text in error message" do
           expect do
-            page.should have_selector("//h1", :text => 'wrong text')
+            expect(page).to have_selector("//h1", :text => 'wrong text')
           end.to raise_error(%r(expected to find xpath "//h1" with text "wrong text" but there were no matches))
         end
       end
 
       context "with should_not" do
         it "passes if has_no_css? returns true" do
-          page.should_not have_selector(:css, 'h1#doesnotexist')
+          expect(page).not_to have_selector(:css, 'h1#doesnotexist')
         end
 
         it "fails if has_no_selector? returns false" do
           expect do
-            page.should_not have_selector(:css, 'h1', :text => 'test')
+            expect(page).not_to have_selector(:css, 'h1', :text => 'test')
           end.to raise_error(%r(expected not to find css "h1" with text "test"))
         end
       end
@@ -241,38 +241,38 @@ describe Capybara::RSpecMatchers do
 
   describe "have_content matcher" do
     it "gives proper description" do
-      have_content('Text').description.should == "text \"Text\""
+      expect(have_content('Text').description).to eq("text \"Text\"")
     end
 
     context "on a string" do
       context "with should" do
         it "passes if has_content? returns true" do
-          "<h1>Text</h1>".should have_content('Text')
+          expect("<h1>Text</h1>").to have_content('Text')
         end
 
         it "passes if has_content? returns true using regexp" do
-          "<h1>Text</h1>".should have_content(/ext/)
+          expect("<h1>Text</h1>").to have_content(/ext/)
         end
 
         it "fails if has_content? returns false" do
           expect do
-            "<h1>Text</h1>".should have_content('No such Text')
+            expect("<h1>Text</h1>").to have_content('No such Text')
           end.to raise_error(/expected to find text "No such Text" in "Text"/)
         end
       end
 
       context "with should_not" do
         it "passes if has_no_content? returns true" do
-          "<h1>Text</h1>".should_not have_content('No such Text')
+          expect("<h1>Text</h1>").not_to have_content('No such Text')
         end
 
         it "passes because escapes any characters that would have special meaning in a regexp" do
-          "<h1>Text</h1>".should_not have_content('.')
+          expect("<h1>Text</h1>").not_to have_content('.')
         end
 
         it "fails if has_no_content? returns false" do
           expect do
-            "<h1>Text</h1>".should_not have_content('Text')
+            expect("<h1>Text</h1>").not_to have_content('Text')
           end.to raise_error(/expected not to find text "Text" in "Text"/)
         end
       end
@@ -285,16 +285,16 @@ describe Capybara::RSpecMatchers do
 
       context "with should" do
         it "passes if has_content? returns true" do
-          page.should have_content('This is a test')
+          expect(page).to have_content('This is a test')
         end
 
         it "passes if has_content? returns true using regexp" do
-          page.should have_content(/test/)
+          expect(page).to have_content(/test/)
         end
 
         it "fails if has_content? returns false" do
           expect do
-            page.should have_content('No such Text')
+            expect(page).to have_content('No such Text')
           end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
         end
 
@@ -302,7 +302,7 @@ describe Capybara::RSpecMatchers do
           before { Capybara.default_selector = :css }
           it "fails if has_content? returns false" do
             expect do
-              page.should have_content('No such Text')
+              expect(page).to have_content('No such Text')
             end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
           end
           after { Capybara.default_selector = :xpath }
@@ -311,12 +311,12 @@ describe Capybara::RSpecMatchers do
 
       context "with should_not" do
         it "passes if has_no_content? returns true" do
-          page.should_not have_content('No such Text')
+          expect(page).not_to have_content('No such Text')
         end
 
         it "fails if has_no_content? returns false" do
           expect do
-            page.should_not have_content('This is a test')
+            expect(page).not_to have_content('This is a test')
           end.to raise_error(/expected not to find text "This is a test"/)
         end
       end
@@ -325,68 +325,68 @@ describe Capybara::RSpecMatchers do
 
   describe "have_text matcher" do
     it "gives proper description" do
-      have_text('Text').description.should == "text \"Text\""
+      expect(have_text('Text').description).to eq("text \"Text\"")
     end
 
     context "on a string" do
       context "with should" do
         it "passes if has_text? returns true" do
-          "<h1>Text</h1>".should have_text('Text')
+          expect("<h1>Text</h1>").to have_text('Text')
         end
 
         it "passes if has_text? returns true using regexp" do
-          "<h1>Text</h1>".should have_text(/ext/)
+          expect("<h1>Text</h1>").to have_text(/ext/)
         end
 
         it "fails if has_text? returns false" do
           expect do
-            "<h1>Text</h1>".should have_text('No such Text')
+            expect("<h1>Text</h1>").to have_text('No such Text')
           end.to raise_error(/expected to find text "No such Text" in "Text"/)
         end
 
         it "casts Fixnum to string" do
           expect do
-            "<h1>Text</h1>".should have_text(3)
+            expect("<h1>Text</h1>").to have_text(3)
           end.to raise_error(/expected to find text "3" in "Text"/)
         end
 
         it "fails if matched text count does not equal to expected count" do
           expect do
-            "<h1>Text</h1>".should have_text('Text', count: 2)
+            expect("<h1>Text</h1>").to have_text('Text', count: 2)
           end.to raise_error(/expected to find text "Text" 2 times in "Text"/)
         end
 
         it "fails if matched text count is less than expected minimum count" do
           expect do
-            "<h1>Text</h1>".should have_text('Lorem', minimum: 1)
+            expect("<h1>Text</h1>").to have_text('Lorem', minimum: 1)
           end.to raise_error(/expected to find text "Lorem" at least 1 time in "Text"/)
         end
 
         it "fails if matched text count is more than expected maximum count" do
           expect do
-            "<h1>Text TextText</h1>".should have_text('Text', maximum: 2)
+            expect("<h1>Text TextText</h1>").to have_text('Text', maximum: 2)
           end.to raise_error(/expected to find text "Text" at most 2 times in "Text TextText"/)
         end
 
         it "fails if matched text count does not belong to expected range" do
           expect do
-            "<h1>Text</h1>".should have_text('Text', between: 2..3)
+            expect("<h1>Text</h1>").to have_text('Text', between: 2..3)
           end.to raise_error(/expected to find text "Text" between 2 and 3 times in "Text"/)
         end
       end
 
       context "with should_not" do
         it "passes if has_no_text? returns true" do
-          "<h1>Text</h1>".should_not have_text('No such Text')
+          expect("<h1>Text</h1>").not_to have_text('No such Text')
         end
 
         it "passes because escapes any characters that would have special meaning in a regexp" do
-          "<h1>Text</h1>".should_not have_text('.')
+          expect("<h1>Text</h1>").not_to have_text('.')
         end
 
         it "fails if has_no_text? returns false" do
           expect do
-            "<h1>Text</h1>".should_not have_text('Text')
+            expect("<h1>Text</h1>").not_to have_text('Text')
           end.to raise_error(/expected not to find text "Text" in "Text"/)
         end
       end
@@ -399,25 +399,25 @@ describe Capybara::RSpecMatchers do
 
       context "with should" do
         it "passes if has_text? returns true" do
-          page.should have_text('This is a test')
+          expect(page).to have_text('This is a test')
         end
 
         it "passes if has_text? returns true using regexp" do
-          page.should have_text(/test/)
+          expect(page).to have_text(/test/)
         end
 
         it "can check for all text" do
-          page.should have_text(:all, 'Some of this text is hidden!')
+          expect(page).to have_text(:all, 'Some of this text is hidden!')
         end
 
         it "can check for visible text" do
-          page.should have_text(:visible, 'Some of this text is')
-          page.should_not have_text(:visible, 'Some of this text is hidden!')
+          expect(page).to have_text(:visible, 'Some of this text is')
+          expect(page).not_to have_text(:visible, 'Some of this text is hidden!')
         end
 
         it "fails if has_text? returns false" do
           expect do
-            page.should have_text('No such Text')
+            expect(page).to have_text('No such Text')
           end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
         end
 
@@ -425,7 +425,7 @@ describe Capybara::RSpecMatchers do
           before { Capybara.default_selector = :css }
           it "fails if has_text? returns false" do
             expect do
-              page.should have_text('No such Text')
+              expect(page).to have_text('No such Text')
             end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
           end
           after { Capybara.default_selector = :xpath }
@@ -434,12 +434,12 @@ describe Capybara::RSpecMatchers do
 
       context "with should_not" do
         it "passes if has_no_text? returns true" do
-          page.should_not have_text('No such Text')
+          expect(page).not_to have_text('No such Text')
         end
 
         it "fails if has_no_text? returns false" do
           expect do
-            page.should_not have_text('This is a test')
+            expect(page).not_to have_text('This is a test')
           end.to raise_error(/expected not to find text "This is a test"/)
         end
       end
@@ -450,35 +450,35 @@ describe Capybara::RSpecMatchers do
     let(:html) { '<a href="#">Just a link</a>' }
 
     it "gives proper description" do
-      have_link('Just a link').description.should == "have link \"Just a link\""
+      expect(have_link('Just a link').description).to eq("have link \"Just a link\"")
     end
 
     it "passes if there is such a button" do
-      html.should have_link('Just a link')
+      expect(html).to have_link('Just a link')
     end
 
     it "fails if there is no such button" do
       expect do
-        html.should have_link('No such Link')
+        expect(html).to have_link('No such Link')
       end.to raise_error(/expected to find link "No such Link"/)
     end
   end
 
   describe "have_title matcher" do
     it "gives proper description" do
-      have_title('Just a title').description.should == "have title \"Just a title\""
+      expect(have_title('Just a title').description).to eq("have title \"Just a title\"")
     end
 
     context "on a string" do
       let(:html) { '<title>Just a title</title>' }
 
       it "passes if there is such a title" do
-        html.should have_title('Just a title')
+        expect(html).to have_title('Just a title')
       end
 
       it "fails if there is no such title" do
         expect do
-          html.should have_title('No such title')
+          expect(html).to have_title('No such title')
         end.to raise_error(/expected there to be title "No such title"/)
       end
     end
@@ -489,12 +489,12 @@ describe Capybara::RSpecMatchers do
       end
 
       it "passes if there is such a title" do
-        page.should have_title('with_js')
+        expect(page).to have_title('with_js')
       end
 
       it "fails if there is no such title" do
         expect do
-          page.should have_title('No such title')
+          expect(page).to have_title('No such title')
         end.to raise_error(/expected there to be title "No such title"/)
       end
     end
@@ -504,16 +504,16 @@ describe Capybara::RSpecMatchers do
     let(:html) { '<button>A button</button><input type="submit" value="Another button"/>' }
 
     it "gives proper description" do
-      have_button('A button').description.should == "have button \"A button\""
+      expect(have_button('A button').description).to eq("have button \"A button\"")
     end
 
     it "passes if there is such a button" do
-      html.should have_button('A button')
+      expect(html).to have_button('A button')
     end
 
     it "fails if there is no such button" do
       expect do
-        html.should have_button('No such Button')
+        expect(html).to have_button('No such Button')
       end.to raise_error(/expected to find button "No such Button"/)
     end
   end
@@ -522,30 +522,30 @@ describe Capybara::RSpecMatchers do
     let(:html) { '<p><label>Text field<input type="text" value="some value"/></label></p>' }
 
     it "gives proper description" do
-      have_field('Text field').description.should == "have field \"Text field\""
+      expect(have_field('Text field').description).to eq("have field \"Text field\"")
     end
 
     it "gives proper description for a given value" do
-      have_field('Text field', with: 'some value').description.should == "have field \"Text field\" with value \"some value\""
+      expect(have_field('Text field', with: 'some value').description).to eq("have field \"Text field\" with value \"some value\"")
     end
 
     it "passes if there is such a field" do
-      html.should have_field('Text field')
+      expect(html).to have_field('Text field')
     end
 
     it "passes if there is such a field with value" do
-      html.should have_field('Text field', with: 'some value')
+      expect(html).to have_field('Text field', with: 'some value')
     end
 
     it "fails if there is no such field" do
       expect do
-        html.should have_field('No such Field')
+        expect(html).to have_field('No such Field')
       end.to raise_error(/expected to find field "No such Field"/)
     end
 
     it "fails if there is such field but with false value" do
       expect do
-        html.should have_field('Text field', with: 'false value')
+        expect(html).to have_field('Text field', with: 'false value')
       end.to raise_error(/expected to find field "Text field"/)
     end
 
@@ -555,7 +555,7 @@ describe Capybara::RSpecMatchers do
           "some value"
         end
       end
-      html.should have_field('Text field', with: Foo.new)
+      expect(html).to have_field('Text field', with: Foo.new)
     end
   end
 
@@ -566,23 +566,23 @@ describe Capybara::RSpecMatchers do
     end
 
     it "gives proper description" do
-      have_checked_field('it is checked').description.should == "have field \"it is checked\""
+      expect(have_checked_field('it is checked').description).to eq("have field \"it is checked\"")
     end
 
     context "with should" do
       it "passes if there is such a field and it is checked" do
-        html.should have_checked_field('it is checked')
+        expect(html).to have_checked_field('it is checked')
       end
 
       it "fails if there is such a field but it is not checked" do
         expect do
-          html.should have_checked_field('unchecked field')
+          expect(html).to have_checked_field('unchecked field')
         end.to raise_error(/expected to find field "unchecked field"/)
       end
 
       it "fails if there is no such field" do
         expect do
-          html.should have_checked_field('no such field')
+          expect(html).to have_checked_field('no such field')
         end.to raise_error(/expected to find field "no such field"/)
       end
     end
@@ -590,16 +590,16 @@ describe Capybara::RSpecMatchers do
     context "with should not" do
       it "fails if there is such a field and it is checked" do
         expect do
-          html.should_not have_checked_field('it is checked')
+          expect(html).not_to have_checked_field('it is checked')
         end.to raise_error(/expected not to find field "it is checked"/)
       end
 
       it "passes if there is such a field but it is not checked" do
-        html.should_not have_checked_field('unchecked field')
+        expect(html).not_to have_checked_field('unchecked field')
       end
 
       it "passes if there is no such field" do
-        html.should_not have_checked_field('no such field')
+        expect(html).not_to have_checked_field('no such field')
       end
     end
   end
@@ -611,23 +611,23 @@ describe Capybara::RSpecMatchers do
     end
 
     it "gives proper description" do
-      have_unchecked_field('unchecked field').description.should == "have field \"unchecked field\""
+      expect(have_unchecked_field('unchecked field').description).to eq("have field \"unchecked field\"")
     end
 
     context "with should" do
       it "passes if there is such a field and it is not checked" do
-        html.should have_unchecked_field('unchecked field')
+        expect(html).to have_unchecked_field('unchecked field')
       end
 
       it "fails if there is such a field but it is checked" do
         expect do
-          html.should have_unchecked_field('it is checked')
+          expect(html).to have_unchecked_field('it is checked')
         end.to raise_error(/expected to find field "it is checked"/)
       end
 
       it "fails if there is no such field" do
         expect do
-          html.should have_unchecked_field('no such field')
+          expect(html).to have_unchecked_field('no such field')
         end.to raise_error(/expected to find field "no such field"/)
       end
     end
@@ -635,16 +635,16 @@ describe Capybara::RSpecMatchers do
     context "with should not" do
       it "fails if there is such a field and it is not checked" do
         expect do
-          html.should_not have_unchecked_field('unchecked field')
+          expect(html).not_to have_unchecked_field('unchecked field')
         end.to raise_error(/expected not to find field "unchecked field"/)
       end
 
       it "passes if there is such a field but it is checked" do
-        html.should_not have_unchecked_field('it is checked')
+        expect(html).not_to have_unchecked_field('it is checked')
       end
 
       it "passes if there is no such field" do
-        html.should_not have_unchecked_field('no such field')
+        expect(html).not_to have_unchecked_field('no such field')
       end
     end
   end
@@ -653,16 +653,16 @@ describe Capybara::RSpecMatchers do
     let(:html) { '<label>Select Box<select></select></label>' }
 
     it "gives proper description" do
-      have_select('Select Box').description.should == "have select box \"Select Box\""
+      expect(have_select('Select Box').description).to eq("have select box \"Select Box\"")
     end
 
     it "passes if there is such a select" do
-      html.should have_select('Select Box')
+      expect(html).to have_select('Select Box')
     end
 
     it "fails if there is no such select" do
       expect do
-        html.should have_select('No such Select box')
+        expect(html).to have_select('No such Select box')
       end.to raise_error(/expected to find select box "No such Select box"/)
     end
   end
@@ -671,16 +671,16 @@ describe Capybara::RSpecMatchers do
     let(:html) { '<table><caption>Lovely table</caption></table>' }
 
     it "gives proper description" do
-      have_table('Lovely table').description.should == "have table \"Lovely table\""
+      expect(have_table('Lovely table').description).to eq("have table \"Lovely table\"")
     end
 
     it "passes if there is such a select" do
-      html.should have_table('Lovely table')
+      expect(html).to have_table('Lovely table')
     end
 
     it "fails if there is no such select" do
       expect do
-        html.should have_table('No such Table')
+        expect(html).to have_table('No such Table')
       end.to raise_error(/expected to find table "No such Table"/)
     end
   end