capybara 2.2.1 → 2.3.0

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

@@ -4,15 +4,15 @@ Capybara::SpecHelper.spec '#has_link?' do
   end
 
   it "should be true if the given link is on the page" do
-    @session.should have_link('foo')
-    @session.should have_link('awesome title')
-    @session.should have_link('A link', :href => '/with_simple_html')
-    @session.should have_link(:'A link', :href => :'/with_simple_html')
+    expect(@session).to have_link('foo')
+    expect(@session).to have_link('awesome title')
+    expect(@session).to have_link('A link', :href => '/with_simple_html')
+    expect(@session).to have_link(:'A link', :href => :'/with_simple_html')
   end
 
   it "should be false if the given link is not on the page" do
-    @session.should_not have_link('monkey')
-    @session.should_not have_link('A link', :href => '/non-existant-href')
+    expect(@session).not_to have_link('monkey')
+    expect(@session).not_to have_link('A link', :href => '/non-existant-href')
   end
 end
 
@@ -22,13 +22,13 @@ Capybara::SpecHelper.spec '#has_no_link?' do
   end
 
   it "should be false if the given link is on the page" do
-    @session.should_not have_no_link('foo')
-    @session.should_not have_no_link('awesome title')
-    @session.should_not have_no_link('A link', :href => '/with_simple_html')
+    expect(@session).not_to have_no_link('foo')
+    expect(@session).not_to have_no_link('awesome title')
+    expect(@session).not_to have_no_link('A link', :href => '/with_simple_html')
   end
 
   it "should be true if the given link is not on the page" do
-    @session.should have_no_link('monkey')
-    @session.should have_no_link('A link', :href => '/non-existant-href')
+    expect(@session).to have_no_link('monkey')
+    expect(@session).to have_no_link('A link', :href => '/non-existant-href')
   end
 end

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

@@ -2,60 +2,60 @@ Capybara::SpecHelper.spec '#has_select?' do
   before { @session.visit('/form') }
 
   it "should be true if the field is on the page" do
-    @session.should have_select('Locale')
-    @session.should have_select('form_region')
-    @session.should have_select('Languages')
-    @session.should have_select(:'Languages')
+    expect(@session).to have_select('Locale')
+    expect(@session).to have_select('form_region')
+    expect(@session).to have_select('Languages')
+    expect(@session).to have_select(:'Languages')
   end
 
   it "should be false if the field is not on the page" do
-    @session.should_not have_select('Monkey')
+    expect(@session).not_to have_select('Monkey')
   end
 
   context 'with selected value' do
     it "should be true if a field with the given value is on the page" do
-      @session.should have_select('form_locale', :selected => 'English')
-      @session.should have_select('Region', :selected => 'Norway')
-      @session.should have_select('Underwear', :selected => [
+      expect(@session).to have_select('form_locale', :selected => 'English')
+      expect(@session).to have_select('Region', :selected => 'Norway')
+      expect(@session).to have_select('Underwear', :selected => [
         'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
     end
 
     it "should be false if the given field is not on the page" do
-      @session.should_not have_select('Locale', :selected => 'Swedish')
-      @session.should_not have_select('Does not exist', :selected => 'John')
-      @session.should_not have_select('City', :selected => 'Not there')
-      @session.should_not have_select('Underwear', :selected => [
+      expect(@session).not_to have_select('Locale', :selected => 'Swedish')
+      expect(@session).not_to have_select('Does not exist', :selected => 'John')
+      expect(@session).not_to have_select('City', :selected => 'Not there')
+      expect(@session).not_to have_select('Underwear', :selected => [
         'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns', 'Nonexistant'
       ])
-      @session.should_not have_select('Underwear', :selected => [
+      expect(@session).not_to have_select('Underwear', :selected => [
         'Boxerbriefs', 'Briefs', 'Boxers', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
-      @session.should_not have_select('Underwear', :selected => [
+      expect(@session).not_to have_select('Underwear', :selected => [
         'Boxerbriefs', 'Briefs','Commando', "Frenchman's Pantalons"
       ])
     end
 
     it "should be true after the given value is selected" do
       @session.select('Swedish', :from => 'Locale')
-      @session.should have_select('Locale', :selected => 'Swedish')
+      expect(@session).to have_select('Locale', :selected => 'Swedish')
     end
 
     it "should be false after a different value is selected" do
       @session.select('Swedish', :from => 'Locale')
-      @session.should_not have_select('Locale', :selected => 'English')
+      expect(@session).not_to have_select('Locale', :selected => 'English')
     end
 
     it "should be true after the given values are selected" do
       @session.select('Boxers', :from => 'Underwear')
-      @session.should have_select('Underwear', :selected => [
+      expect(@session).to have_select('Underwear', :selected => [
         'Boxerbriefs', 'Briefs', 'Boxers', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
     end
 
     it "should be false after one of the values is unselected" do
       @session.unselect('Briefs', :from => 'Underwear')
-      @session.should_not have_select('Underwear', :selected => [
+      expect(@session).not_to have_select('Underwear', :selected => [
         'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
     end
@@ -63,29 +63,29 @@ Capybara::SpecHelper.spec '#has_select?' do
 
   context 'with exact options' do
     it "should be true if a field with the given options is on the page" do
-      @session.should have_select('Region', :options => ['Norway', 'Sweden', 'Finland'])
-      @session.should have_select('Tendency', :options => [])
+      expect(@session).to have_select('Region', :options => ['Norway', 'Sweden', 'Finland'])
+      expect(@session).to have_select('Tendency', :options => [])
     end
 
     it "should be false if the given field is not on the page" do
-      @session.should_not have_select('Locale', :options => ['Swedish'])
-      @session.should_not have_select('Does not exist', :options => ['John'])
-      @session.should_not have_select('City', :options => ['London', 'Made up city'])
-      @session.should_not have_select('Region', :options => ['Norway', 'Sweden'])
-      @session.should_not have_select('Region', :options => ['Norway', 'Norway', 'Norway'])
+      expect(@session).not_to have_select('Locale', :options => ['Swedish'])
+      expect(@session).not_to have_select('Does not exist', :options => ['John'])
+      expect(@session).not_to have_select('City', :options => ['London', 'Made up city'])
+      expect(@session).not_to have_select('Region', :options => ['Norway', 'Sweden'])
+      expect(@session).not_to have_select('Region', :options => ['Norway', 'Norway', 'Norway'])
     end
   end
 
   context 'with partial options' do
     it "should be true if a field with the given partial options is on the page" do
-      @session.should have_select('Region', :with_options => ['Norway', 'Sweden'])
-      @session.should have_select('City', :with_options => ['London'])
+      expect(@session).to have_select('Region', :with_options => ['Norway', 'Sweden'])
+      expect(@session).to have_select('City', :with_options => ['London'])
     end
 
     it "should be false if a field with the given partial options is not on the page" do
-      @session.should_not have_select('Locale', :with_options => ['Uruguayan'])
-      @session.should_not have_select('Does not exist', :with_options => ['John'])
-      @session.should_not have_select('Region', :with_options => ['Norway', 'Sweden', 'Finland', 'Latvia'])
+      expect(@session).not_to have_select('Locale', :with_options => ['Uruguayan'])
+      expect(@session).not_to have_select('Does not exist', :with_options => ['John'])
+      expect(@session).not_to have_select('Region', :with_options => ['Norway', 'Sweden', 'Finland', 'Latvia'])
     end
   end
 end
@@ -94,59 +94,59 @@ Capybara::SpecHelper.spec '#has_no_select?' do
   before { @session.visit('/form') }
 
   it "should be false if the field is on the page" do
-    @session.should_not have_no_select('Locale')
-    @session.should_not have_no_select('form_region')
-    @session.should_not have_no_select('Languages')
+    expect(@session).not_to have_no_select('Locale')
+    expect(@session).not_to have_no_select('form_region')
+    expect(@session).not_to have_no_select('Languages')
   end
 
   it "should be true if the field is not on the page" do
-    @session.should have_no_select('Monkey')
+    expect(@session).to have_no_select('Monkey')
   end
 
   context 'with selected value' do
     it "should be false if a field with the given value is on the page" do
-      @session.should_not have_no_select('form_locale', :selected => 'English')
-      @session.should_not have_no_select('Region', :selected => 'Norway')
-      @session.should_not have_no_select('Underwear', :selected => [
+      expect(@session).not_to have_no_select('form_locale', :selected => 'English')
+      expect(@session).not_to have_no_select('Region', :selected => 'Norway')
+      expect(@session).not_to have_no_select('Underwear', :selected => [
         'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
     end
 
     it "should be true if the given field is not on the page" do
-      @session.should have_no_select('Locale', :selected => 'Swedish')
-      @session.should have_no_select('Does not exist', :selected => 'John')
-      @session.should have_no_select('City', :selected => 'Not there')
-      @session.should have_no_select('Underwear', :selected => [
+      expect(@session).to have_no_select('Locale', :selected => 'Swedish')
+      expect(@session).to have_no_select('Does not exist', :selected => 'John')
+      expect(@session).to have_no_select('City', :selected => 'Not there')
+      expect(@session).to have_no_select('Underwear', :selected => [
         'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns', 'Nonexistant'
       ])
-      @session.should have_no_select('Underwear', :selected => [
+      expect(@session).to have_no_select('Underwear', :selected => [
         'Boxerbriefs', 'Briefs', 'Boxers', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
-      @session.should have_no_select('Underwear', :selected => [
+      expect(@session).to have_no_select('Underwear', :selected => [
         'Boxerbriefs', 'Briefs','Commando', "Frenchman's Pantalons"
       ])
     end
 
     it "should be false after the given value is selected" do
       @session.select('Swedish', :from => 'Locale')
-      @session.should_not have_no_select('Locale', :selected => 'Swedish')
+      expect(@session).not_to have_no_select('Locale', :selected => 'Swedish')
     end
 
     it "should be true after a different value is selected" do
       @session.select('Swedish', :from => 'Locale')
-      @session.should have_no_select('Locale', :selected => 'English')
+      expect(@session).to have_no_select('Locale', :selected => 'English')
     end
 
     it "should be false after the given values are selected" do
       @session.select('Boxers', :from => 'Underwear')
-      @session.should_not have_no_select('Underwear', :selected => [
+      expect(@session).not_to have_no_select('Underwear', :selected => [
         'Boxerbriefs', 'Briefs', 'Boxers', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
     end
 
     it "should be true after one of the values is unselected" do
       @session.unselect('Briefs', :from => 'Underwear')
-      @session.should have_no_select('Underwear', :selected => [
+      expect(@session).to have_no_select('Underwear', :selected => [
         'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
     end
@@ -154,28 +154,28 @@ Capybara::SpecHelper.spec '#has_no_select?' do
 
   context 'with exact options' do
     it "should be false if a field with the given options is on the page" do
-      @session.should_not have_no_select('Region', :options => ['Norway', 'Sweden', 'Finland'])
+      expect(@session).not_to have_no_select('Region', :options => ['Norway', 'Sweden', 'Finland'])
     end
 
     it "should be true if the given field is not on the page" do
-      @session.should have_no_select('Locale', :options => ['Swedish'])
-      @session.should have_no_select('Does not exist', :options => ['John'])
-      @session.should have_no_select('City', :options => ['London', 'Made up city'])
-      @session.should have_no_select('Region', :options => ['Norway', 'Sweden'])
-      @session.should have_no_select('Region', :options => ['Norway', 'Norway', 'Norway'])
+      expect(@session).to have_no_select('Locale', :options => ['Swedish'])
+      expect(@session).to have_no_select('Does not exist', :options => ['John'])
+      expect(@session).to have_no_select('City', :options => ['London', 'Made up city'])
+      expect(@session).to have_no_select('Region', :options => ['Norway', 'Sweden'])
+      expect(@session).to have_no_select('Region', :options => ['Norway', 'Norway', 'Norway'])
     end
   end
 
   context 'with partial options' do
     it "should be false if a field with the given partial options is on the page" do
-      @session.should_not have_no_select('Region', :with_options => ['Norway', 'Sweden'])
-      @session.should_not have_no_select('City', :with_options => ['London'])
+      expect(@session).not_to have_no_select('Region', :with_options => ['Norway', 'Sweden'])
+      expect(@session).not_to have_no_select('City', :with_options => ['London'])
     end
 
     it "should be true if a field with the given partial options is not on the page" do
-      @session.should have_no_select('Locale', :with_options => ['Uruguayan'])
-      @session.should have_no_select('Does not exist', :with_options => ['John'])
-      @session.should have_no_select('Region', :with_options => ['Norway', 'Sweden', 'Finland', 'Latvia'])
+      expect(@session).to have_no_select('Locale', :with_options => ['Uruguayan'])
+      expect(@session).to have_no_select('Does not exist', :with_options => ['John'])
+      expect(@session).to have_no_select('Region', :with_options => ['Norway', 'Sweden', 'Finland', 'Latvia'])
     end
   end
 end

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

@@ -4,67 +4,67 @@ Capybara::SpecHelper.spec '#has_selector?' do
   end
 
   it "should be true if the given selector is on the page" do
-    @session.should have_selector(:xpath, "//p")
-    @session.should have_selector(:css, "p a#foo")
-    @session.should have_selector("//p[contains(.,'est')]")
+    expect(@session).to have_selector(:xpath, "//p")
+    expect(@session).to have_selector(:css, "p a#foo")
+    expect(@session).to have_selector("//p[contains(.,'est')]")
   end
 
   it "should be false if the given selector is not on the page" do
-    @session.should_not have_selector(:xpath, "//abbr")
-    @session.should_not have_selector(:css, "p a#doesnotexist")
-    @session.should_not have_selector("//p[contains(.,'thisstringisnotonpage')]")
+    expect(@session).not_to have_selector(:xpath, "//abbr")
+    expect(@session).not_to have_selector(:css, "p a#doesnotexist")
+    expect(@session).not_to have_selector("//p[contains(.,'thisstringisnotonpage')]")
   end
 
   it "should use default selector" do
     Capybara.default_selector = :css
-    @session.should_not have_selector("p a#doesnotexist")
-    @session.should have_selector("p a#foo")
+    expect(@session).not_to have_selector("p a#doesnotexist")
+    expect(@session).to have_selector("p a#foo")
   end
 
   it "should respect scopes" do
     @session.within "//p[@id='first']" do
-      @session.should have_selector(".//a[@id='foo']")
-      @session.should_not have_selector(".//a[@id='red']")
+      expect(@session).to have_selector(".//a[@id='foo']")
+      expect(@session).not_to have_selector(".//a[@id='red']")
     end
   end
 
   context "with count" do
     it "should be true if the content is on the page the given number of times" do
-      @session.should have_selector("//p", :count => 3)
-      @session.should have_selector("//p//a[@id='foo']", :count => 1)
-      @session.should have_selector("//p[contains(.,'est')]", :count => 1)
+      expect(@session).to have_selector("//p", :count => 3)
+      expect(@session).to have_selector("//p//a[@id='foo']", :count => 1)
+      expect(@session).to have_selector("//p[contains(.,'est')]", :count => 1)
     end
 
     it "should be false if the content is on the page the given number of times" do
-      @session.should_not have_selector("//p", :count => 6)
-      @session.should_not have_selector("//p//a[@id='foo']", :count => 2)
-      @session.should_not have_selector("//p[contains(.,'est')]", :count => 5)
+      expect(@session).not_to have_selector("//p", :count => 6)
+      expect(@session).not_to have_selector("//p//a[@id='foo']", :count => 2)
+      expect(@session).not_to have_selector("//p[contains(.,'est')]", :count => 5)
     end
 
     it "should be false if the content isn't on the page at all" do
-      @session.should_not have_selector("//abbr", :count => 2)
-      @session.should_not have_selector("//p//a[@id='doesnotexist']", :count => 1)
+      expect(@session).not_to have_selector("//abbr", :count => 2)
+      expect(@session).not_to have_selector("//p//a[@id='doesnotexist']", :count => 1)
     end
   end
 
   context "with text" do
     it "should discard all matches where the given string is not contained" do
-      @session.should have_selector("//p//a", :text => "Redirect", :count => 1)
-      @session.should_not have_selector("//p", :text => "Doesnotexist")
+      expect(@session).to have_selector("//p//a", :text => "Redirect", :count => 1)
+      expect(@session).not_to have_selector("//p", :text => "Doesnotexist")
     end
 
     it "should respect visibility setting" do
-      @session.should have_selector(:id, "hidden-text", :text => "Some of this text is hidden!", :visible => false)
-      @session.should_not have_selector(:id, "hidden-text", :text => "Some of this text is hidden!", :visible => true)
+      expect(@session).to have_selector(:id, "hidden-text", :text => "Some of this text is hidden!", :visible => false)
+      expect(@session).not_to have_selector(:id, "hidden-text", :text => "Some of this text is hidden!", :visible => true)
       Capybara.ignore_hidden_elements = false
-      @session.should have_selector(:id, "hidden-text", :text => "Some of this text is hidden!", :visible => false)
+      expect(@session).to have_selector(:id, "hidden-text", :text => "Some of this text is hidden!", :visible => false)
       Capybara.visible_text_only = true
-      @session.should_not have_selector(:id, "hidden-text", :text => "Some of this text is hidden!", :visible => true)
+      expect(@session).not_to have_selector(:id, "hidden-text", :text => "Some of this text is hidden!", :visible => true)
     end
 
     it "should discard all matches where the given regexp is not matched" do
-      @session.should have_selector("//p//a", :text => /re[dab]i/i, :count => 1)
-      @session.should_not have_selector("//p//a", :text => /Red$/)
+      expect(@session).to have_selector("//p//a", :text => /re[dab]i/i, :count => 1)
+      expect(@session).not_to have_selector("//p//a", :text => /Red$/)
     end
   end
 end
@@ -75,58 +75,58 @@ Capybara::SpecHelper.spec '#has_no_selector?' do
   end
 
   it "should be false if the given selector is on the page" do
-    @session.should_not have_no_selector(:xpath, "//p")
-    @session.should_not have_no_selector(:css, "p a#foo")
-    @session.should_not have_no_selector("//p[contains(.,'est')]")
+    expect(@session).not_to have_no_selector(:xpath, "//p")
+    expect(@session).not_to have_no_selector(:css, "p a#foo")
+    expect(@session).not_to have_no_selector("//p[contains(.,'est')]")
   end
 
   it "should be true if the given selector is not on the page" do
-    @session.should have_no_selector(:xpath, "//abbr")
-    @session.should have_no_selector(:css, "p a#doesnotexist")
-    @session.should have_no_selector("//p[contains(.,'thisstringisnotonpage')]")
+    expect(@session).to have_no_selector(:xpath, "//abbr")
+    expect(@session).to have_no_selector(:css, "p a#doesnotexist")
+    expect(@session).to have_no_selector("//p[contains(.,'thisstringisnotonpage')]")
   end
 
   it "should use default selector" do
     Capybara.default_selector = :css
-    @session.should have_no_selector("p a#doesnotexist")
-    @session.should_not have_no_selector("p a#foo")
+    expect(@session).to have_no_selector("p a#doesnotexist")
+    expect(@session).not_to have_no_selector("p a#foo")
   end
 
   it "should respect scopes" do
     @session.within "//p[@id='first']" do
-      @session.should_not have_no_selector(".//a[@id='foo']")
-      @session.should have_no_selector(".//a[@id='red']")
+      expect(@session).not_to have_no_selector(".//a[@id='foo']")
+      expect(@session).to have_no_selector(".//a[@id='red']")
     end
   end
 
   context "with count" do
     it "should be false if the content is on the page the given number of times" do
-      @session.should_not have_no_selector("//p", :count => 3)
-      @session.should_not have_no_selector("//p//a[@id='foo']", :count => 1)
-      @session.should_not have_no_selector("//p[contains(.,'est')]", :count => 1)
+      expect(@session).not_to have_no_selector("//p", :count => 3)
+      expect(@session).not_to have_no_selector("//p//a[@id='foo']", :count => 1)
+      expect(@session).not_to have_no_selector("//p[contains(.,'est')]", :count => 1)
     end
 
     it "should be true if the content is on the page the wrong number of times" do
-      @session.should have_no_selector("//p", :count => 6)
-      @session.should have_no_selector("//p//a[@id='foo']", :count => 2)
-      @session.should have_no_selector("//p[contains(.,'est')]", :count => 5)
+      expect(@session).to have_no_selector("//p", :count => 6)
+      expect(@session).to have_no_selector("//p//a[@id='foo']", :count => 2)
+      expect(@session).to have_no_selector("//p[contains(.,'est')]", :count => 5)
     end
 
     it "should be true if the content isn't on the page at all" do
-      @session.should have_no_selector("//abbr", :count => 2)
-      @session.should have_no_selector("//p//a[@id='doesnotexist']", :count => 1)
+      expect(@session).to have_no_selector("//abbr", :count => 2)
+      expect(@session).to have_no_selector("//p//a[@id='doesnotexist']", :count => 1)
     end
   end
 
   context "with text" do
     it "should discard all matches where the given string is contained" do
-      @session.should_not have_no_selector("//p//a", :text => "Redirect", :count => 1)
-      @session.should have_no_selector("//p", :text => "Doesnotexist")
+      expect(@session).not_to have_no_selector("//p//a", :text => "Redirect", :count => 1)
+      expect(@session).to have_no_selector("//p", :text => "Doesnotexist")
     end
 
     it "should discard all matches where the given regexp is matched" do
-      @session.should_not have_no_selector("//p//a", :text => /re[dab]i/i, :count => 1)
-      @session.should have_no_selector("//p//a", :text => /Red$/)
+      expect(@session).not_to have_no_selector("//p//a", :text => /re[dab]i/i, :count => 1)
+      expect(@session).to have_no_selector("//p//a", :text => /Red$/)
     end
   end
 end