capybara 2.2.1 → 2.3.0

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

@@ -2,25 +2,25 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
   it "should click on a link" do
     @session.visit('/with_html')
     @session.click_link_or_button('labore')
-    @session.should have_content('Bar')
+    expect(@session).to have_content('Bar')
   end
 
   it "should click on a button" do
     @session.visit('/form')
     @session.click_link_or_button('awe123')
-    extract_results(@session)['first_name'].should == 'John'
+    expect(extract_results(@session)['first_name']).to eq('John')
   end
 
   it "should click on a button with no type attribute" do
     @session.visit('/form')
     @session.click_link_or_button('no_type')
-    extract_results(@session)['first_name'].should == 'John'
+    expect(extract_results(@session)['first_name']).to eq('John')
   end
 
   it "should be aliased as click_on" do
     @session.visit('/form')
     @session.click_on('awe123')
-    extract_results(@session)['first_name'].should == 'John'
+    expect(extract_results(@session)['first_name']).to eq('John')
   end
 
   it "should wait for asynchronous load", :requires => [:js] do
@@ -32,7 +32,7 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
   it "casts to string" do
     @session.visit('/form')
     @session.click_link_or_button(:'awe123')
-    extract_results(@session)['first_name'].should == 'John'
+    expect(extract_results(@session)['first_name']).to eq('John')
   end
 
   context "with :exact option" do
@@ -40,13 +40,13 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
       it "clicks on approximately matching link" do
         @session.visit('/with_html')
         @session.click_link_or_button('abore', :exact => false)
-        @session.should have_content('Bar')
+        expect(@session).to have_content('Bar')
       end
 
       it "clicks on approximately matching button" do
         @session.visit('/form')
         @session.click_link_or_button('awe')
-        extract_results(@session)['first_name'].should == 'John'
+        expect(extract_results(@session)['first_name']).to eq('John')
       end
     end
 
@@ -98,7 +98,7 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
     it "happily clicks on links which incorrectly have the disabled attribute" do
       @session.visit('/with_html')
       @session.click_link_or_button('Disabled link')
-      @session.should have_content("Bar")
+      expect(@session).to have_content("Bar")
     end
 
     it "does nothing when button is disabled" do

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

@@ -11,49 +11,56 @@ Capybara::SpecHelper.spec '#click_link' do
 
   it "casts to string" do
     @session.click_link(:'foo')
-    @session.should have_content('Another World')
+    expect(@session).to have_content('Another World')
+  end
+
+  it "raises any errors caught inside the server", :requires => [:server] do
+    quietly { @session.visit("/error") }
+    expect do
+      @session.click_link('foo')
+    end.to raise_error(TestApp::TestAppError)
   end
 
   context "with id given" do
     it "should take user to the linked page" do
       @session.click_link('foo')
-      @session.should have_content('Another World')
+      expect(@session).to have_content('Another World')
     end
   end
 
   context "with text given" do
     it "should take user to the linked page" do
       @session.click_link('labore')
-      @session.should have_content('Bar')
+      expect(@session).to have_content('Bar')
     end
 
     it "should accept partial matches" do
       @session.click_link('abo')
-      @session.should have_content('Bar')
+      expect(@session).to have_content('Bar')
     end
   end
 
   context "with title given" do
     it "should take user to the linked page" do
       @session.click_link('awesome title')
-      @session.should have_content('Bar')
+      expect(@session).to have_content('Bar')
     end
 
     it "should accept partial matches" do
       @session.click_link('some titl')
-      @session.should have_content('Bar')
+      expect(@session).to have_content('Bar')
     end
   end
 
   context "with alternative text given to a contained image" do
     it "should take user to the linked page" do
       @session.click_link('awesome image')
-      @session.should have_content('Bar')
+      expect(@session).to have_content('Bar')
     end
 
     it "should accept partial matches" do
       @session.click_link('some imag')
-      @session.should have_content('Bar')
+      expect(@session).to have_content('Bar')
     end
   end
 
@@ -69,7 +76,7 @@ Capybara::SpecHelper.spec '#click_link' do
   context "with :href option given" do
     it "should find links with valid href" do
       @session.click_link('labore', :href => '/with_simple_html')
-      @session.should have_content('Bar')
+      expect(@session).to have_content('Bar')
     end
 
     it "should raise error if link wasn't found" do
@@ -80,46 +87,46 @@ Capybara::SpecHelper.spec '#click_link' do
   it "should follow relative links" do
     @session.visit('/')
     @session.click_link('Relative')
-    @session.should have_content('This is a test')
+    expect(@session).to have_content('This is a test')
   end
 
   it "should follow protocol relative links" do
     @session.click_link('Protocol')
-    @session.should have_content('Another World')
+    expect(@session).to have_content('Another World')
   end
 
   it "should follow redirects" do
     @session.click_link('Redirect')
-    @session.should have_content('You landed')
+    expect(@session).to have_content('You landed')
   end
 
   it "should follow redirects" do
     @session.click_link('BackToMyself')
-    @session.should have_content('This is a test')
+    expect(@session).to have_content('This is a test')
   end
 
   it "should add query string to current URL with naked query string" do
     @session.click_link('Naked Query String')
-    @session.should have_content('Query String sent')
+    expect(@session).to have_content('Query String sent')
   end
 
   it "should do nothing on anchor links" do
     @session.fill_in("test_field", :with => 'blah')
     @session.click_link('Normal Anchor')
-    @session.find_field("test_field").value.should == 'blah'
+    expect(@session.find_field("test_field").value).to eq('blah')
     @session.click_link('Blank Anchor')
-    @session.find_field("test_field").value.should == 'blah'
+    expect(@session.find_field("test_field").value).to eq('blah')
   end
 
   it "should do nothing on URL+anchor links for the same page" do
     @session.fill_in("test_field", :with => 'blah')
     @session.click_link('Anchor on same page')
-    @session.find_field("test_field").value.should == 'blah'
+    expect(@session.find_field("test_field").value).to eq('blah')
   end
 
   it "should follow link on URL+anchor links for a different page" do
     @session.click_link('Anchor on different page')
-    @session.should have_content('Bar')
+    expect(@session).to have_content('Bar')
   end
 
   it "raise an error with links with no href" do
@@ -131,7 +138,7 @@ Capybara::SpecHelper.spec '#click_link' do
   context "with :exact option" do
     it "should accept partial matches when false" do
       @session.click_link('abo', :exact => false)
-      @session.should have_content('Bar')
+      expect(@session).to have_content('Bar')
     end
 
     it "should not accept partial matches when true" do

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

@@ -5,14 +5,14 @@ Capybara::SpecHelper.spec '#current_scope' do
   
   context "when not in a #within block" do
     it "should return the document" do
-      @session.current_scope.should be_kind_of Capybara::Node::Document
+      expect(@session.current_scope).to be_kind_of Capybara::Node::Document
     end
   end
   
   context "when in a #within block" do
     it "should return the element in scope" do
       @session.within(:css, "#simple_first_name") do
-        @session.current_scope[:name].should eq 'first_name'
+        expect(@session.current_scope[:name]).to eq 'first_name'
       end
     end
   end
@@ -21,7 +21,7 @@ Capybara::SpecHelper.spec '#current_scope' do
     it "should return the element in scope" do
       @session.within("//div[@id='for_bar']") do
         @session.within(".//input[@value='Peter']") do
-          @session.current_scope[:name].should eq 'form[first_name]'
+          expect(@session.current_scope[:name]).to eq 'form[first_name]'
         end
       end
     end

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

@@ -2,8 +2,8 @@ Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
   before :all do
     @servers = 2.times.map { Capybara::Server.new(TestApp.clone).boot }
     # sanity check
-    @servers[0].port.should_not == @servers[1].port
-    @servers.map { |s| s.port }.should_not include 80
+    expect(@servers[0].port).not_to eq(@servers[1].port)
+    expect(@servers.map { |s| s.port }).not_to include 80
   end
 
   def bases
@@ -13,12 +13,12 @@ Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
   def should_be_on server_index, path="/host", scheme="http"
     # Check that we are on /host on the given server
     s = @servers[server_index]
-    @session.current_url.chomp('?').should == "#{scheme}://#{s.host}:#{s.port}#{path}"
-    @session.current_host.should == "#{scheme}://#{s.host}" # no port
-    @session.current_path.should == path
+    expect(@session.current_url.chomp('?')).to eq("#{scheme}://#{s.host}:#{s.port}#{path}")
+    expect(@session.current_host).to eq("#{scheme}://#{s.host}") # no port
+    expect(@session.current_path).to eq(path)
     if path == '/host'
       # Server should agree with us
-      @session.should have_content("Current host is #{scheme}://#{s.host}:#{s.port}")
+      expect(@session).to have_content("Current host is #{scheme}://#{s.host}:#{s.port}")
     end
   end
 
@@ -82,12 +82,12 @@ Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
   it "is affected by pushState", :requires => [:js] do
     @session.visit("/with_js")
     @session.execute_script("window.history.pushState({}, '', '/pushed')")
-    @session.current_path.should == "/pushed"
+    expect(@session.current_path).to eq("/pushed")
   end
 
   it "is affected by replaceState", :requires => [:js] do
     @session.visit("/with_js")
     @session.execute_script("window.history.replaceState({}, '', '/replaced')")
-    @session.current_path.should == "/replaced"
+    expect(@session.current_path).to eq("/replaced")
   end
 end

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

@@ -1,6 +1,6 @@
 Capybara::SpecHelper.spec "#evaluate_script", :requires => [:js] do
   it "should evaluate the given script and return whatever it produces" do
     @session.visit('/with_js')
-    @session.evaluate_script("1+3").should == 4
+    expect(@session.evaluate_script("1+3")).to eq(4)
   end
 end

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

@@ -1,7 +1,7 @@
 Capybara::SpecHelper.spec "#execute_script", :requires => [:js] do
   it "should execute the given script and return nothing" do
     @session.visit('/with_js')
-    @session.execute_script("$('#change').text('Funky Doodle')").should be_nil
-    @session.should have_css('#change', :text => 'Funky Doodle')
+    expect(@session.execute_script("$('#change').text('Funky Doodle')")).to be_nil
+    expect(@session).to have_css('#change', :text => 'Funky Doodle')
   end
 end

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

@@ -6,101 +6,101 @@ Capybara::SpecHelper.spec "#fill_in" do
   it "should fill in a text field by id" do
     @session.fill_in('form_first_name', :with => 'Harry')
     @session.click_button('awesome')
-    extract_results(@session)['first_name'].should == 'Harry'
+    expect(extract_results(@session)['first_name']).to eq('Harry')
   end
 
   it "should fill in a text field by name" do
     @session.fill_in('form[last_name]', :with => 'Green')
     @session.click_button('awesome')
-    extract_results(@session)['last_name'].should == 'Green'
+    expect(extract_results(@session)['last_name']).to eq('Green')
   end
 
   it "should fill in a text field by label without for" do
     @session.fill_in('First Name', :with => 'Harry')
     @session.click_button('awesome')
-    extract_results(@session)['first_name'].should == 'Harry'
+    expect(extract_results(@session)['first_name']).to eq('Harry')
   end
 
   it "should fill in a url field by label without for" do
     @session.fill_in('Html5 Url', :with => 'http://www.avenueq.com')
     @session.click_button('html5_submit')
-    extract_results(@session)['html5_url'].should == 'http://www.avenueq.com'
+    expect(extract_results(@session)['html5_url']).to eq('http://www.avenueq.com')
   end
 
   it "should fill in a textarea by id" do
     @session.fill_in('form_description', :with => 'Texty text')
     @session.click_button('awesome')
-    extract_results(@session)['description'].should == 'Texty text'
+    expect(extract_results(@session)['description']).to eq('Texty text')
   end
 
   it "should fill in a textarea by label" do
     @session.fill_in('Description', :with => 'Texty text')
     @session.click_button('awesome')
-    extract_results(@session)['description'].should == 'Texty text'
+    expect(extract_results(@session)['description']).to eq('Texty text')
   end
 
   it "should fill in a textarea by name" do
     @session.fill_in('form[description]', :with => 'Texty text')
     @session.click_button('awesome')
-    extract_results(@session)['description'].should == 'Texty text'
+    expect(extract_results(@session)['description']).to eq('Texty text')
   end
 
   it "should fill in a password field by id" do
     @session.fill_in('form_password', :with => 'supasikrit')
     @session.click_button('awesome')
-    extract_results(@session)['password'].should == 'supasikrit'
+    expect(extract_results(@session)['password']).to eq('supasikrit')
   end
 
   it "should handle HTML in a textarea" do
     @session.fill_in('form_description', :with => 'is <strong>very</strong> secret!')
     @session.click_button('awesome')
-    extract_results(@session)['description'].should == 'is <strong>very</strong> secret!'
+    expect(extract_results(@session)['description']).to eq('is <strong>very</strong> secret!')
   end
 
   it "should handle newlines in a textarea" do
     @session.fill_in('form_description', :with => "\nSome text\n")
     @session.click_button('awesome')
-    extract_results(@session)['description'].should == "\r\nSome text\r\n"
+    expect(extract_results(@session)['description']).to eq("\r\nSome text\r\n")
   end
 
   it "should fill in a field with a custom type" do
     @session.fill_in('Schmooo', :with => 'Schmooo is the game')
     @session.click_button('awesome')
-    extract_results(@session)['schmooo'].should == 'Schmooo is the game'
+    expect(extract_results(@session)['schmooo']).to eq('Schmooo is the game')
   end
 
   it "should fill in a field without a type" do
     @session.fill_in('Phone', :with => '+1 555 7022')
     @session.click_button('awesome')
-    extract_results(@session)['phone'].should == '+1 555 7022'
+    expect(extract_results(@session)['phone']).to eq('+1 555 7022')
   end
 
   it "should fill in a text field respecting its maxlength attribute" do
     @session.fill_in('Zipcode', :with => '52071350')
     @session.click_button('awesome')
-    extract_results(@session)['zipcode'].should == '52071'
+    expect(extract_results(@session)['zipcode']).to eq('52071')
   end
 
   it "should fill in a password field by name" do
     @session.fill_in('form[password]', :with => 'supasikrit')
     @session.click_button('awesome')
-    extract_results(@session)['password'].should == 'supasikrit'
+    expect(extract_results(@session)['password']).to eq('supasikrit')
   end
 
   it "should fill in a password field by label" do
     @session.fill_in('Password', :with => 'supasikrit')
     @session.click_button('awesome')
-    extract_results(@session)['password'].should == 'supasikrit'
+    expect(extract_results(@session)['password']).to eq('supasikrit')
   end
 
   it "should fill in a password field by name" do
     @session.fill_in('form[password]', :with => 'supasikrit')
     @session.click_button('awesome')
-    extract_results(@session)['password'].should == 'supasikrit'
+    expect(extract_results(@session)['password']).to eq('supasikrit')
   end
 
   it "should throw an exception if a hash containing 'with' is not provided" do
-    lambda{@session.fill_in 'Name', 'ignu'}.should raise_error
+    expect {@session.fill_in 'Name', 'ignu'}.to raise_error
   end
 
   it "should wait for asynchronous load", :requires => [:js] do
@@ -112,13 +112,13 @@ Capybara::SpecHelper.spec "#fill_in" do
   it "casts to string" do
     @session.fill_in(:'form_first_name', :with => :'Harry')
     @session.click_button('awesome')
-    extract_results(@session)['first_name'].should == 'Harry'
+    expect(extract_results(@session)['first_name']).to eq('Harry')
   end
 
   it "casts to string if field has maxlength" do
     @session.fill_in(:'form_zipcode', :with => 1234567)
     @session.click_button('awesome')
-    extract_results(@session)['zipcode'].should == '12345'
+    expect(extract_results(@session)['zipcode']).to eq('12345')
   end
 
   context 'on a pre-populated textfield with a reformatting onchange', :requires => [:js] do
@@ -127,7 +127,7 @@ Capybara::SpecHelper.spec "#fill_in" do
       @session.fill_in('with_change_event', :with => 'some value')
       # click outside the field to trigger the change event
       @session.find(:css, 'body').click
-      @session.find(:css, '.change_event_triggered', :match => :one).should have_text 'some value'
+      expect(@session.find(:css, '.change_event_triggered', :match => :one)).to have_text 'some value'
     end
 
     it 'should trigger change when clearing field' do
@@ -135,7 +135,7 @@ Capybara::SpecHelper.spec "#fill_in" do
       @session.fill_in('with_change_event', :with => '')
       # click outside the field to trigger the change event
       @session.find(:css, 'body').click
-      @session.should have_selector(:css, '.change_event_triggered', :match => :one)
+      expect(@session).to have_selector(:css, '.change_event_triggered', :match => :one)
     end
   end
 
@@ -171,7 +171,7 @@ Capybara::SpecHelper.spec "#fill_in" do
     it "should accept partial matches when false" do
       @session.fill_in("Explanation", :with => "Dude", :exact => false)
       @session.click_button("awesome")
-      extract_results(@session)["name_explanation"].should == "Dude"
+      expect(extract_results(@session)["name_explanation"]).to eq("Dude")
     end
 
     it "should not accept partial matches when true" do

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

@@ -4,12 +4,12 @@ Capybara::SpecHelper.spec '#find_button' do
   end
 
   it "should find any button" do
-    @session.find_button('med')[:id].should == "mediocre"
-    @session.find_button('crap321').value.should == "crappy"
+    expect(@session.find_button('med')[:id]).to eq("mediocre")
+    expect(@session.find_button('crap321').value).to eq("crappy")
   end
 
   it "casts to string" do
-    @session.find_button(:'med')[:id].should == "mediocre"
+    expect(@session.find_button(:'med')[:id]).to eq("mediocre")
   end
 
   it "should raise error if the button doesn't exist" do
@@ -20,7 +20,7 @@ Capybara::SpecHelper.spec '#find_button' do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      @session.find_button('What an Awesome', :exact => false)[:value].should == "awesome"
+      expect(@session.find_button('What an Awesome', :exact => false)[:value]).to eq("awesome")
     end
 
     it "should not accept partial matches when true" do