capybara 1.1.4 → 2.0.0.beta2

data/spec/rack_test_spec.rb

@@ -0,0 +1,152 @@
+require 'spec_helper'
+
+describe Capybara::Session do
+  context 'with rack test driver' do
+    before do
+      @session = TestSessions::RackTest
+    end
+
+    describe '#driver' do
+      it "should be a rack test driver" do
+        @session.driver.should be_an_instance_of(Capybara::RackTest::Driver)
+      end
+    end
+
+    describe '#mode' do
+      it "should remember the mode" do
+        @session.mode.should == :rack_test
+      end
+    end
+
+    describe '#click_link' do
+      it "should use data-method if option is true" do
+        @session.driver.options[:respect_data_method] = true
+        @session.visit "/with_html"
+        @session.click_link "A link with data-method"
+        @session.body.should include('The requested object was deleted')
+      end
+
+      it "should not use data-method if option is false" do
+        @session.driver.options[:respect_data_method] = false
+        @session.visit "/with_html"
+        @session.click_link "A link with data-method"
+        @session.body.should include('Not deleted')
+      end
+
+      it "should use data-method if available even if it's capitalized" do
+        @session.driver.options[:respect_data_method] = true
+        @session.visit "/with_html"
+        @session.click_link "A link with capitalized data-method"
+        @session.body.should include('The requested object was deleted')
+      end
+
+      after do
+        @session.driver.options[:respect_data_method] = false
+      end
+    end
+
+    describe "#attach_file" do
+      context "with multipart form" do
+        it "should submit an empty form-data section if no file is submitted" do
+          @session.visit("/form")
+          @session.click_button("Upload Empty")
+          @session.body.should include('Successfully ignored empty file field.')
+        end
+      end
+    end
+
+    it_should_behave_like "session"
+    it_should_behave_like "session without javascript support"
+    it_should_behave_like "session without screenshot support"
+    it_should_behave_like "session with headers support"
+    it_should_behave_like "session with status code support"
+  end
+end
+
+describe Capybara::RackTest::Driver do
+  before do
+    @driver = TestSessions::RackTest.driver
+  end
+
+  describe ':headers option' do
+    it 'should always set headers' do
+      @driver = Capybara::RackTest::Driver.new(TestApp, :headers => {'HTTP_FOO' => 'foobar'})
+      @driver.visit('/get_header')
+      @driver.body.should include('foobar')
+    end
+
+    it 'should keep headers on link clicks' do
+      @driver = Capybara::RackTest::Driver.new(TestApp, :headers => {'HTTP_FOO' => 'foobar'})
+      @driver.visit('/header_links')
+      @driver.find('.//a').first.click
+      @driver.body.should include('foobar')
+    end
+
+    it 'should keep headers on form submit' do
+      @driver = Capybara::RackTest::Driver.new(TestApp, :headers => {'HTTP_FOO' => 'foobar'})
+      @driver.visit('/header_links')
+      @driver.find('.//input').first.click
+      @driver.body.should include('foobar')
+    end
+
+    it 'should keep headers on redirects' do
+      @driver = Capybara::RackTest::Driver.new(TestApp, :headers => {'HTTP_FOO' => 'foobar'})
+      @driver.visit('/get_header_via_redirect')
+      @driver.body.should include('foobar')
+    end
+  end
+
+  describe ':follow_redirects option' do
+    it "defaults to following redirects" do
+      @driver = Capybara::RackTest::Driver.new(TestApp)
+
+      @driver.visit('/redirect')
+      @driver.response.header['Location'].should be_nil
+      @driver.browser.current_url.should eq "#{@driver.browser.current_host}/landed"
+    end
+
+    it "is possible to not follow redirects" do
+      @driver = Capybara::RackTest::Driver.new(TestApp, :follow_redirects => false)
+
+      @driver.visit('/redirect')
+      @driver.response.header['Location'].should eq "#{@driver.browser.current_host}/redirect_again"
+      @driver.browser.current_url.should eq "#{@driver.browser.current_host}/redirect"
+    end
+  end
+
+  describe ':redirect_limit option' do
+    context "with default redirect limit" do
+      before do
+        @driver = Capybara::RackTest::Driver.new(TestApp)
+      end
+
+      it "should follow 5 redirects" do
+        @driver.visit("/redirect/5/times")
+        @driver.body.should include('redirection complete')
+      end
+
+      it "should not follow more than 6 redirects" do
+        running do
+          @driver.visit("/redirect/6/times")
+        end.should raise_error(Capybara::InfiniteRedirectError)
+      end
+    end
+
+    context "with 21 redirect limit" do
+      before do
+        @driver = Capybara::RackTest::Driver.new(TestApp, :redirect_limit => 21)
+      end
+
+      it "should follow 21 redirects" do
+        @driver.visit("/redirect/21/times")
+        @driver.body.should include('redirection complete')
+      end
+
+      it "should not follow more than 21 redirects" do
+        running do
+          @driver.visit("/redirect/22/times")
+        end.should raise_error(Capybara::InfiniteRedirectError)
+      end
+    end
+  end
+end

data/spec/rspec/features_spec.rb

@@ -1,8 +1,6 @@
 require 'spec_helper'
 require 'capybara/rspec'
 
-Capybara.app = TestApp
-
 RSpec.configuration.before(:each, :example_group => {:file_path => "./spec/rspec/features_spec.rb"}) do
   @in_filtered_hook = true
 end

data/spec/rspec/matchers_spec.rb

@@ -2,15 +2,13 @@ require 'spec_helper'
 require 'capybara/dsl'
 require 'capybara/rspec/matchers'
 
-Capybara.app = TestApp
-
 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 == "has css \"h1\""
+      have_css('h1').description.should == "have css \"h1\""
     end
 
     context "on a string" do
@@ -22,7 +20,7 @@ describe Capybara::RSpecMatchers do
         it "fails if has_css? returns false" do
           expect do
             "<h1>Text</h1>".should have_css('h2')
-          end.to raise_error(/expected css "h2" to return something/)
+          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
@@ -32,7 +30,7 @@ describe Capybara::RSpecMatchers do
         it "fails if matched node count does not equal expected count" do
           expect do
             "<h1>Text</h1>".should have_css('h1', :count => 2)
-          end.to raise_error(/expected css "h1" to return something/)
+          end.to raise_error(/expected css "h1" to be found 2 times/)
         end
       end
 
@@ -44,7 +42,7 @@ describe Capybara::RSpecMatchers do
         it "fails if has_no_css? returns false" do
           expect do
             "<h1>Text</h1>".should_not have_css('h1')
-          end.to raise_error(/expected css "h1" not to return anything/)
+          end.to raise_error(/expected not to find css "h1"/)
         end
 
         it "passes if matched node count does not equal expected count" do
@@ -54,7 +52,7 @@ describe Capybara::RSpecMatchers do
         it "fails if matched node count equals expected count" do
           expect do
             "<h1>Text</h1>".should_not have_css('h1', :count => 1)
-          end.to raise_error(/expected css "h1" not to return anything/)
+          end.to raise_error(/expected not to find css "h1"/)
         end
       end
     end
@@ -72,7 +70,7 @@ describe Capybara::RSpecMatchers do
         it "fails if has_css? returns false" do
           expect do
             page.should have_css('h1#doesnotexist')
-          end.to raise_error(/expected css "h1#doesnotexist" to return something/)
+          end.to raise_error(/expected to find css "h1#doesnotexist" but there were no matches/)
         end
       end
 
@@ -84,7 +82,7 @@ describe Capybara::RSpecMatchers do
         it "fails if has_no_css? returns false" do
           expect do
             page.should_not have_css('h1')
-          end.to raise_error(/expected css "h1" not to return anything/)
+          end.to raise_error(/expected not to find css "h1"/)
         end
       end
     end
@@ -92,31 +90,31 @@ describe Capybara::RSpecMatchers do
 
   describe "have_xpath matcher" do
     it "gives proper description" do
-      have_xpath('//h1').description.should == "has xpath \"\/\/h1\""
+      have_xpath('//h1').description.should == "have xpath \"\/\/h1\""
     end
 
     context "on a string" do
       context "with should" do
-        it "passes if has_css? returns true" do
+        it "passes if has_xpath? returns true" do
           "<h1>Text</h1>".should have_xpath('//h1')
         end
 
-        it "fails if has_css? returns false" do
+        it "fails if has_xpath? returns false" do
           expect do
             "<h1>Text</h1>".should have_xpath('//h2')
-          end.to raise_error(%r(expected xpath "//h2" to return something))
+          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_css? returns true" do
+        it "passes if has_no_xpath? returns true" do
           "<h1>Text</h1>".should_not have_xpath('//h2')
         end
 
-        it "fails if has_no_css? returns false" do
+        it "fails if has_no_xpath? returns false" do
           expect do
             "<h1>Text</h1>".should_not have_xpath('//h1')
-          end.to raise_error(%r(expected xpath "//h1" not to return anything))
+          end.to raise_error(%r(expected not to find xpath "//h1"))
         end
       end
     end
@@ -127,26 +125,26 @@ describe Capybara::RSpecMatchers do
       end
 
       context "with should" do
-        it "passes if has_css? returns true" do
+        it "passes if has_xpath? returns true" do
           page.should have_xpath('//h1')
         end
 
-        it "fails if has_css? returns false" do
+        it "fails if has_xpath? returns false" do
           expect do
             page.should have_xpath("//h1[@id='doesnotexist']")
-          end.to raise_error(%r(expected xpath "//h1\[@id='doesnotexist'\]" to return something))
+          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_css? returns true" do
+        it "passes if has_no_xpath? returns true" do
           page.should_not have_xpath('//h1[@id="doesnotexist"]')
         end
 
-        it "fails if has_no_css? returns false" do
+        it "fails if has_no_xpath? returns false" do
           expect do
             page.should_not have_xpath('//h1')
-          end.to raise_error(%r(expected xpath "//h1" not to return anything))
+          end.to raise_error(%r(expected not to find xpath "//h1"))
         end
       end
     end
@@ -154,41 +152,33 @@ describe Capybara::RSpecMatchers do
 
   describe "have_selector matcher" do
     it "gives proper description" do
-      have_selector('//h1').description.should == "has xpath \"//h1\""
+      matcher = have_selector('//h1')
+      "<h1>Text</h1>".should matcher
+      matcher.description.should == "have xpath \"//h1\""
     end
 
     context "on a string" do
       context "with should" do
-        it "passes if has_css? returns true" do
+        it "passes if has_selector? returns true" do
           "<h1>Text</h1>".should have_selector('//h1')
         end
 
-        it "fails if has_css? returns false" do
+        it "fails if has_selector? returns false" do
           expect do
             "<h1>Text</h1>".should have_selector('//h2')
-          end.to raise_error(%r(expected xpath "//h2" to return something))
-        end
-
-        it "fails with the selector's failure_message if set" do
-          Capybara.add_selector(:monkey) do
-            xpath { |num| ".//*[contains(@id, 'monkey')][#{num}]" }
-            failure_message { |node, selector| node.all(".//*[contains(@id, 'monkey')]").map { |node| node.text }.sort.join(', ') }
-          end
-          expect do
-            '<h1 id="monkey_paul">Monkey John</h1>'.should have_selector(:monkey, 14)
-          end.to raise_error("Monkey John")
+          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_css? returns true" do
+        it "passes if has_no_selector? returns true" do
           "<h1>Text</h1>".should_not have_selector(:css, 'h2')
         end
 
-        it "fails if has_no_css? returns false" do
+        it "fails if has_no_selector? returns false" do
           expect do
             "<h1>Text</h1>".should_not have_selector(:css, 'h1')
-          end.to raise_error(%r(expected css "h1" not to return anything))
+          end.to raise_error(%r(expected not to find css "h1"))
         end
       end
     end
@@ -199,30 +189,20 @@ describe Capybara::RSpecMatchers do
       end
 
       context "with should" do
-        it "passes if has_css? returns true" do
+        it "passes if has_selector? returns true" do
           page.should have_selector('//h1', :text => 'test')
         end
 
-        it "fails if has_css? returns false" do
+        it "fails if has_selector? returns false" do
           expect do
             page.should have_selector("//h1[@id='doesnotexist']")
-          end.to raise_error(%r(expected xpath "//h1\[@id='doesnotexist'\]" to return something))
+          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')
-          end.to raise_error(%r(expected xpath "//h1" with text "wrong text" to return something))
-        end
-
-        it "fails with the selector's failure_message if set" do
-          Capybara.add_selector(:monkey) do
-            xpath { |num| ".//*[contains(@id, 'monkey')][#{num}]" }
-            failure_message { |node, selector| node.all(".//*[contains(@id, 'monkey')]").map { |node| node.text }.sort.join(', ') }
-          end
-          expect do
-            page.should have_selector(:monkey, 14)
-          end.to raise_error("Monkey John, Monkey Paul")
+          end.to raise_error(%r(expected to find xpath "//h1" with text "wrong text" but there were no matches))
         end
       end
 
@@ -231,10 +211,10 @@ describe Capybara::RSpecMatchers do
           page.should_not have_selector(:css, 'h1#doesnotexist')
         end
 
-        it "fails if has_no_css? returns false" do
+        it "fails if has_no_selector? returns false" do
           expect do
             page.should_not have_selector(:css, 'h1', :text => 'test')
-          end.to raise_error(%r(expected css "h1" with text "test" not to return anything))
+          end.to raise_error(%r(expected not to find css "h1" with text "test"))
         end
       end
     end
@@ -242,31 +222,39 @@ describe Capybara::RSpecMatchers do
 
   describe "have_content matcher" do
     it "gives proper description" do
-      have_content('Text').description.should == "has content \"Text\""
+      have_content('Text').description.should == "have text \"Text\""
     end
 
     context "on a string" do
       context "with should" do
-        it "passes if has_css? returns true" do
+        it "passes if has_content? returns true" do
           "<h1>Text</h1>".should have_content('Text')
         end
 
-        it "fails if has_css? returns false" do
+        it "passes if has_content? returns true using regexp" do
+          "<h1>Text</h1>".should have_content(/ext/)
+        end
+
+        it "fails if has_content? returns false" do
           expect do
             "<h1>Text</h1>".should have_content('No such Text')
-          end.to raise_error(/expected there to be content "No such Text" in "Text"/)
+          end.to raise_error(/expected there to be text "No such Text" in "Text"/)
         end
       end
 
       context "with should_not" do
-        it "passes if has_no_css? returns true" do
+        it "passes if has_no_content? returns true" do
           "<h1>Text</h1>".should_not have_content('No such Text')
         end
 
-        it "fails if has_no_css? returns false" do
+        it "passes because escapes any characters that would have special meaning in a regexp" do
+          "<h1>Text</h1>".should_not have_content('.')
+        end
+
+        it "fails if has_no_content? returns false" do
           expect do
             "<h1>Text</h1>".should_not have_content('Text')
-          end.to raise_error(/expected content "Text" not to return anything/)
+          end.to raise_error(/expected there not to be text "Text" in "Text"/)
         end
       end
     end
@@ -277,36 +265,124 @@ describe Capybara::RSpecMatchers do
       end
 
       context "with should" do
-        it "passes if has_css? returns true" do
+        it "passes if has_content? returns true" do
           page.should have_content('This is a test')
         end
 
-        it "fails if has_css? returns false" do
+        it "passes if has_content? returns true using regexp" do
+          page.should have_content(/test/)
+        end
+
+        it "fails if has_content? returns false" do
           expect do
             page.should have_content('No such Text')
-          end.to raise_error(/expected there to be content "No such Text" in "(.*)This is a test(.*)"/)
+          end.to raise_error(/expected there to be text "No such Text" in "(.*)This is a test(.*)"/)
         end
 
         context "with default selector CSS" do
           before { Capybara.default_selector = :css }
-          it "fails if has_css? returns false" do
+          it "fails if has_content? returns false" do
             expect do
               page.should have_content('No such Text')
-            end.to raise_error(/expected there to be content "No such Text" in "(.*)This is a test(.*)"/)
+            end.to raise_error(/expected there to be text "No such Text" in "(.*)This is a test(.*)"/)
           end
           after { Capybara.default_selector = :xpath }
         end
       end
 
       context "with should_not" do
-        it "passes if has_no_css? returns true" do
+        it "passes if has_no_content? returns true" do
           page.should_not have_content('No such Text')
         end
 
-        it "fails if has_no_css? returns false" do
+        it "fails if has_no_content? returns false" do
           expect do
             page.should_not have_content('This is a test')
-          end.to raise_error(/expected content "This is a test" not to return anything/)
+          end.to raise_error(/expected there not to be text "This is a test"/)
+        end
+      end
+    end
+  end
+
+  describe "have_text matcher" do
+    it "gives proper description" do
+      have_text('Text').description.should == "have 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')
+        end
+
+        it "passes if has_text? returns true using regexp" do
+          "<h1>Text</h1>".should have_text(/ext/)
+        end
+
+        it "fails if has_text? returns false" do
+          expect do
+            "<h1>Text</h1>".should have_text('No such Text')
+          end.to raise_error(/expected there to be text "No such Text" 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')
+        end
+
+        it "passes because escapes any characters that would have special meaning in a regexp" do
+          "<h1>Text</h1>".should_not have_text('.')
+        end
+
+        it "fails if has_no_text? returns false" do
+          expect do
+            "<h1>Text</h1>".should_not have_text('Text')
+          end.to raise_error(/expected there not to be text "Text" in "Text"/)
+        end
+      end
+    end
+
+    context "on a page or node" do
+      before do
+        visit('/with_html')
+      end
+
+      context "with should" do
+        it "passes if has_text? returns true" do
+          page.should have_text('This is a test')
+        end
+
+        it "passes if has_text? returns true using regexp" do
+          page.should have_text(/test/)
+        end
+
+        it "fails if has_text? returns false" do
+          expect do
+            page.should have_text('No such Text')
+          end.to raise_error(/expected there to be text "No such Text" in "(.*)This is a test(.*)"/)
+        end
+
+        context "with default selector CSS" do
+          before { Capybara.default_selector = :css }
+          it "fails if has_text? returns false" do
+            expect do
+              page.should have_text('No such Text')
+            end.to raise_error(/expected there to be text "No such Text" in "(.*)This is a test(.*)"/)
+          end
+          after { Capybara.default_selector = :xpath }
+        end
+      end
+
+      context "with should_not" do
+        it "passes if has_no_text? returns true" do
+          page.should_not 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')
+          end.to raise_error(/expected there not to be text "This is a test"/)
         end
       end
     end
@@ -316,7 +392,7 @@ describe Capybara::RSpecMatchers do
     let(:html) { '<a href="#">Just a link</a>' }
 
     it "gives proper description" do
-      have_link('Just a link').description.should == "has link \"Just a link\""
+      have_link('Just a link').description.should == "have link \"Just a link\""
     end
 
     it "passes if there is such a button" do
@@ -326,7 +402,7 @@ describe Capybara::RSpecMatchers do
     it "fails if there is no such button" do
       expect do
         html.should have_link('No such Link')
-      end.to raise_error(/expected link "No such Link"/)
+      end.to raise_error(/expected to find link "No such Link"/)
     end
   end
 
@@ -334,7 +410,7 @@ 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 == "has button \"A button\""
+      have_button('A button').description.should == "have button \"A button\""
     end
 
     it "passes if there is such a button" do
@@ -344,7 +420,7 @@ describe Capybara::RSpecMatchers do
     it "fails if there is no such button" do
       expect do
         html.should have_button('No such Button')
-      end.to raise_error(/expected button "No such Button"/)
+      end.to raise_error(/expected to find button "No such Button"/)
     end
   end
 
@@ -352,7 +428,7 @@ describe Capybara::RSpecMatchers do
     let(:html) { '<p><label>Text field<input type="text"/></label></p>' }
 
     it "gives proper description" do
-      have_field('Text field').description.should == "has field \"Text field\""
+      have_field('Text field').description.should == "have field \"Text field\""
     end
 
     it "passes if there is such a field" do
@@ -362,7 +438,7 @@ describe Capybara::RSpecMatchers do
     it "fails if there is no such field" do
       expect do
         html.should have_field('No such Field')
-      end.to raise_error(/expected field "No such Field"/)
+      end.to raise_error(/expected to find field "No such Field"/)
     end
   end
 
@@ -373,7 +449,7 @@ describe Capybara::RSpecMatchers do
     end
 
     it "gives proper description" do
-      have_checked_field('it is checked').description.should == "has checked_field \"it is checked\""
+      have_checked_field('it is checked').description.should == "have field \"it is checked\""
     end
 
     context "with should" do
@@ -384,13 +460,13 @@ describe Capybara::RSpecMatchers do
       it "fails if there is such a field but it is not checked" do
         expect do
           html.should have_checked_field('unchecked field')
-        end.to raise_error(/expected 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')
-        end.to raise_error(/expected checked_field "no such field"/)
+        end.to raise_error(/expected to find field "no such field"/)
       end
     end
 
@@ -398,7 +474,7 @@ describe Capybara::RSpecMatchers 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')
-        end.to raise_error(/expected checked_field "it is checked" not to return anything/)
+        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
@@ -418,7 +494,7 @@ describe Capybara::RSpecMatchers do
     end
 
     it "gives proper description" do
-      have_unchecked_field('unchecked field').description.should == "has unchecked_field \"unchecked field\""
+      have_unchecked_field('unchecked field').description.should == "have field \"unchecked field\""
     end
 
     context "with should" do
@@ -429,13 +505,13 @@ describe Capybara::RSpecMatchers do
       it "fails if there is such a field but it is checked" do
         expect do
           html.should have_unchecked_field('it is checked')
-        end.to raise_error(/expected 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')
-        end.to raise_error(/expected unchecked_field "no such field"/)
+        end.to raise_error(/expected to find field "no such field"/)
       end
     end
 
@@ -443,7 +519,7 @@ describe Capybara::RSpecMatchers 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')
-        end.to raise_error(/expected unchecked_field "unchecked field" not to return anything/)
+        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
@@ -460,7 +536,7 @@ describe Capybara::RSpecMatchers do
     let(:html) { '<label>Select Box<select></select></label>' }
 
     it "gives proper description" do
-      have_select('Select Box').description.should == "has select \"Select Box\""
+      have_select('Select Box').description.should == "have select box \"Select Box\""
     end
 
     it "passes if there is such a select" do
@@ -470,7 +546,7 @@ describe Capybara::RSpecMatchers do
     it "fails if there is no such select" do
       expect do
         html.should have_select('No such Select box')
-      end.to raise_error(/expected select "No such Select box"/)
+      end.to raise_error(/expected to find select box "No such Select box"/)
     end
   end
 
@@ -478,7 +554,7 @@ describe Capybara::RSpecMatchers do
     let(:html) { '<table><caption>Lovely table</caption></table>' }
 
     it "gives proper description" do
-      have_table('Lovely table').description.should == "has table \"Lovely table\""
+      have_table('Lovely table').description.should == "have table \"Lovely table\""
     end
 
     it "passes if there is such a select" do
@@ -488,8 +564,7 @@ describe Capybara::RSpecMatchers do
     it "fails if there is no such select" do
       expect do
         html.should have_table('No such Table')
-      end.to raise_error(/expected table "No such Table"/)
+      end.to raise_error(/expected to find table "No such Table"/)
     end
   end
 end
-