capybara 2.2.1 → 2.3.0

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

@@ -4,13 +4,13 @@ Capybara::SpecHelper.spec '#has_table?' do
   end
 
   it "should be true if the table is on the page" do
-    @session.should have_table('Villain')
-    @session.should have_table('villain_table')
-    @session.should have_table(:'villain_table')
+    expect(@session).to have_table('Villain')
+    expect(@session).to have_table('villain_table')
+    expect(@session).to have_table(:'villain_table')
   end
 
   it "should be false if the table is not on the page" do
-    @session.should_not have_table('Monkey')
+    expect(@session).not_to have_table('Monkey')
   end
 end
 
@@ -20,11 +20,11 @@ Capybara::SpecHelper.spec '#has_no_table?' do
   end
 
   it "should be false if the table is on the page" do
-    @session.should_not have_no_table('Villain')
-    @session.should_not have_no_table('villain_table')
+    expect(@session).not_to have_no_table('Villain')
+    expect(@session).not_to have_no_table('villain_table')
   end
 
   it "should be true if the table is not on the page" do
-    @session.should have_no_table('Monkey')
+    expect(@session).to have_no_table('Monkey')
   end
 end

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

@@ -1,193 +1,193 @@
 Capybara::SpecHelper.spec '#has_text?' do
   it "should be true if the given text is on the page at least once" do
     @session.visit('/with_html')
-    @session.should have_text('est')
-    @session.should have_text('Lorem')
-    @session.should have_text('Redirect')
-    @session.should have_text(:'Redirect')
+    expect(@session).to have_text('est')
+    expect(@session).to have_text('Lorem')
+    expect(@session).to have_text('Redirect')
+    expect(@session).to have_text(:'Redirect')
   end
 
   it "should be true if scoped to an element which has the text" do
     @session.visit('/with_html')
     @session.within("//a[@title='awesome title']") do
-      @session.should have_text('labore')
+      expect(@session).to have_text('labore')
     end
   end
 
   it "should be false if scoped to an element which does not have the text" do
     @session.visit('/with_html')
     @session.within("//a[@title='awesome title']") do
-      @session.should_not have_text('monkey')
+      expect(@session).not_to have_text('monkey')
     end
   end
 
   it "should ignore tags" do
     @session.visit('/with_html')
-    @session.should_not have_text('exercitation <a href="/foo" id="foo">ullamco</a> laboris')
-    @session.should have_text('exercitation ullamco laboris')
+    expect(@session).not_to have_text('exercitation <a href="/foo" id="foo">ullamco</a> laboris')
+    expect(@session).to have_text('exercitation ullamco laboris')
   end
 
   it "should ignore extra whitespace and newlines" do
     @session.visit('/with_html')
-    @session.should have_text('text with whitespace')
+    expect(@session).to have_text('text with whitespace')
   end
 
   it "should ignore whitespace and newlines in the search string" do
     @session.visit('/with_html')
-    @session.should have_text("text     with \n\n whitespace")
+    expect(@session).to have_text("text     with \n\n whitespace")
   end
 
   it "should be false if the given text is not on the page" do
     @session.visit('/with_html')
-    @session.should_not have_text('xxxxyzzz')
-    @session.should_not have_text('monkey')
+    expect(@session).not_to have_text('xxxxyzzz')
+    expect(@session).not_to have_text('monkey')
   end
 
   it 'should handle single quotes in the text' do
     @session.visit('/with-quotes')
-    @session.should have_text("can't")
+    expect(@session).to have_text("can't")
   end
 
   it 'should handle double quotes in the text' do
     @session.visit('/with-quotes')
-    @session.should have_text(%q{"No," he said})
+    expect(@session).to have_text(%q{"No," he said})
   end
 
   it 'should handle mixed single and double quotes in the text' do
     @session.visit('/with-quotes')
-    @session.should have_text(%q{"you can't do that."})
+    expect(@session).to have_text(%q{"you can't do that."})
   end
 
   it 'should be false if text is in the title tag in the head' do
     @session.visit('/with_js')
-    @session.should_not have_text('with_js')
+    expect(@session).not_to have_text('with_js')
   end
 
   it 'should be false if text is inside a script tag in the body' do
     @session.visit('/with_js')
-    @session.should_not have_text('a javascript comment')
-    @session.should_not have_text('aVar')
+    expect(@session).not_to have_text('a javascript comment')
+    expect(@session).not_to have_text('aVar')
   end
 
   it "should be false if the given text is on the page but not visible" do
     @session.visit('/with_html')
-    @session.should_not have_text('Inside element with hidden ancestor')
+    expect(@session).not_to have_text('Inside element with hidden ancestor')
   end
 
   it "should be true if :all given and text is invisible." do
     @session.visit('/with_html')
-    @session.should have_text(:all, 'Some of this text is hidden!')
+    expect(@session).to have_text(:all, 'Some of this text is hidden!')
   end
 
   it "should be true if `Capybara.ignore_hidden_elements = true` and text is invisible." do
     Capybara.ignore_hidden_elements = false
     @session.visit('/with_html')
-    @session.should have_text('Some of this text is hidden!')
+    expect(@session).to have_text('Some of this text is hidden!')
   end
 
   it "should be true if the text in the page matches given regexp" do
     @session.visit('/with_html')
-    @session.should have_text(/Lorem/)
+    expect(@session).to have_text(/Lorem/)
   end
 
   it "should be false if the text in the page doesn't match given regexp" do
     @session.visit('/with_html')
-    @session.should_not have_text(/xxxxyzzz/)
+    expect(@session).not_to have_text(/xxxxyzzz/)
   end
 
   it "should escape any characters that would have special meaning in a regexp" do
     @session.visit('/with_html')
-    @session.should_not have_text('.orem')
+    expect(@session).not_to have_text('.orem')
   end
 
   it "should accept non-string parameters" do
     @session.visit('/with_html')
-    @session.should have_text(42)
+    expect(@session).to have_text(42)
   end
 
   it "should be true when passed nil" do
     # Historical behavior; no particular reason other than compatibility.
     @session.visit('/with_html')
-    @session.should have_text(nil)
+    expect(@session).to have_text(nil)
   end
 
   it "should wait for text to appear", :requires => [:js] do
     @session.visit('/with_js')
     @session.click_link('Click me')
-    @session.should have_text("Has been clicked")
+    expect(@session).to have_text("Has been clicked")
   end
 
   context "with between" do
     it "should be true if the text occurs within the range given" do
       @session.visit('/with_count')
-      @session.should have_text('count', between: 1..3)
-      @session.should have_text(/count/, between: 2..2)
+      expect(@session).to have_text('count', between: 1..3)
+      expect(@session).to have_text(/count/, between: 2..2)
     end
 
     it "should be false if the text occurs more or fewer times than range" do
       @session.visit('/with_count')
-      @session.should_not have_text('count', between: 0..1)
-      @session.should_not have_text('count', between: 3..10)
-      @session.should_not have_text(/count/, between: 2...2)
+      expect(@session).not_to have_text('count', between: 0..1)
+      expect(@session).not_to have_text('count', between: 3..10)
+      expect(@session).not_to have_text(/count/, between: 2...2)
     end
   end
 
   context "with count" do
     it "should be true if the text occurs the given number of times" do
       @session.visit('/with_count')
-      @session.should have_text('count', count: 2)
+      expect(@session).to have_text('count', count: 2)
     end
 
     it "should be false if the text occurs a different number of times than the given" do
       @session.visit('/with_count')
-      @session.should_not have_text('count', count: 0)
-      @session.should_not have_text('count', count: 1)
-      @session.should_not have_text(/count/, count: 3)
+      expect(@session).not_to have_text('count', count: 0)
+      expect(@session).not_to have_text('count', count: 1)
+      expect(@session).not_to have_text(/count/, count: 3)
     end
 
     it "should coerce count to an integer" do
       @session.visit('/with_count')
-      @session.should have_text('count', count: '2')
-      @session.should_not have_text('count', count: '3')
+      expect(@session).to have_text('count', count: '2')
+      expect(@session).not_to have_text('count', count: '3')
     end
   end
 
   context "with maximum" do
     it "should be true when text occurs same or fewer times than given" do
       @session.visit('/with_count')
-      @session.should have_text('count', maximum: 2)
-      @session.should have_text(/count/, maximum: 3)
+      expect(@session).to have_text('count', maximum: 2)
+      expect(@session).to have_text(/count/, maximum: 3)
     end
 
     it "should be false when text occurs more times than given" do
       @session.visit('/with_count')
-      @session.should_not have_text('count', maximum: 1)
-      @session.should_not have_text('count', maximum: 0)
+      expect(@session).not_to have_text('count', maximum: 1)
+      expect(@session).not_to have_text('count', maximum: 0)
     end
 
     it "should coerce maximum to an integer" do
       @session.visit('/with_count')
-      @session.should have_text('count', maximum: '2')
-      @session.should_not have_text('count', maximum: '1')
+      expect(@session).to have_text('count', maximum: '2')
+      expect(@session).not_to have_text('count', maximum: '1')
     end
   end
 
   context "with minimum" do
     it "should be true when text occurs same or more times than given" do
       @session.visit('/with_count')
-      @session.should have_text('count', minimum: 2)
-      @session.should have_text(/count/, minimum: 0)
+      expect(@session).to have_text('count', minimum: 2)
+      expect(@session).to have_text(/count/, minimum: 0)
     end
 
     it "should be false when text occurs fewer times than given" do
       @session.visit('/with_count')
-      @session.should_not have_text('count', minimum: 3)
+      expect(@session).not_to have_text('count', minimum: 3)
     end
 
     it "should coerce minimum to an integer" do
       @session.visit('/with_count')
-      @session.should have_text('count', minimum: '2')
-      @session.should_not have_text('count', minimum: '3')
+      expect(@session).to have_text('count', minimum: '2')
+      expect(@session).not_to have_text('count', minimum: '3')
     end
   end
 
@@ -196,7 +196,7 @@ Capybara::SpecHelper.spec '#has_text?' do
       Capybara.using_wait_time(0.1) do
         @session.visit('/with_js')
         @session.click_link('Click me')
-        @session.should have_text('Has been clicked', :wait => 0.9)
+        expect(@session).to have_text('Has been clicked', :wait => 0.9)
       end
     end
   end
@@ -205,105 +205,105 @@ end
 Capybara::SpecHelper.spec '#has_no_text?' do
   it "should be false if the given text is on the page at least once" do
     @session.visit('/with_html')
-    @session.should_not have_no_text('est')
-    @session.should_not have_no_text('Lorem')
-    @session.should_not have_no_text('Redirect')
+    expect(@session).not_to have_no_text('est')
+    expect(@session).not_to have_no_text('Lorem')
+    expect(@session).not_to have_no_text('Redirect')
   end
 
   it "should be false if scoped to an element which has the text" do
     @session.visit('/with_html')
     @session.within("//a[@title='awesome title']") do
-      @session.should_not have_no_text('labore')
+      expect(@session).not_to have_no_text('labore')
     end
   end
 
   it "should be true if scoped to an element which does not have the text" do
     @session.visit('/with_html')
     @session.within("//a[@title='awesome title']") do
-      @session.should have_no_text('monkey')
+      expect(@session).to have_no_text('monkey')
     end
   end
 
   it "should ignore tags" do
     @session.visit('/with_html')
-    @session.should have_no_text('exercitation <a href="/foo" id="foo">ullamco</a> laboris')
-    @session.should_not have_no_text('exercitation ullamco laboris')
+    expect(@session).to have_no_text('exercitation <a href="/foo" id="foo">ullamco</a> laboris')
+    expect(@session).not_to have_no_text('exercitation ullamco laboris')
   end
 
   it "should be true if the given text is not on the page" do
     @session.visit('/with_html')
-    @session.should have_no_text('xxxxyzzz')
-    @session.should have_no_text('monkey')
+    expect(@session).to have_no_text('xxxxyzzz')
+    expect(@session).to have_no_text('monkey')
   end
 
   it 'should handle single quotes in the text' do
     @session.visit('/with-quotes')
-    @session.should_not have_no_text("can't")
+    expect(@session).not_to have_no_text("can't")
   end
 
   it 'should handle double quotes in the text' do
     @session.visit('/with-quotes')
-    @session.should_not have_no_text(%q{"No," he said})
+    expect(@session).not_to have_no_text(%q{"No," he said})
   end
 
   it 'should handle mixed single and double quotes in the text' do
     @session.visit('/with-quotes')
-    @session.should_not have_no_text(%q{"you can't do that."})
+    expect(@session).not_to have_no_text(%q{"you can't do that."})
   end
 
   it 'should be true if text is in the title tag in the head' do
     @session.visit('/with_js')
-    @session.should have_no_text('with_js')
+    expect(@session).to have_no_text('with_js')
   end
 
   it 'should be true if text is inside a script tag in the body' do
     @session.visit('/with_js')
-    @session.should have_no_text('a javascript comment')
-    @session.should have_no_text('aVar')
+    expect(@session).to have_no_text('a javascript comment')
+    expect(@session).to have_no_text('aVar')
   end
 
   it "should be true if the given text is on the page but not visible" do
     @session.visit('/with_html')
-    @session.should have_no_text('Inside element with hidden ancestor')
+    expect(@session).to have_no_text('Inside element with hidden ancestor')
   end
 
   it "should be false if :all given and text is invisible." do
     @session.visit('/with_html')
-    @session.should_not have_no_text(:all, 'Some of this text is hidden!')
+    expect(@session).not_to have_no_text(:all, 'Some of this text is hidden!')
   end
 
   it "should be false if `Capybara.ignore_hidden_elements = true` and text is invisible." do
     Capybara.ignore_hidden_elements = false
     @session.visit('/with_html')
-    @session.should_not have_no_text('Some of this text is hidden!')
+    expect(@session).not_to have_no_text('Some of this text is hidden!')
   end
 
   it "should be true if the text in the page doesn't match given regexp" do
     @session.visit('/with_html')
-    @session.should have_no_text(/xxxxyzzz/)
+    expect(@session).to have_no_text(/xxxxyzzz/)
   end
 
   it "should be false if the text in the page  matches given regexp" do
     @session.visit('/with_html')
-    @session.should_not have_no_text(/Lorem/)
+    expect(@session).not_to have_no_text(/Lorem/)
   end
 
   it "should escape any characters that would have special meaning in a regexp" do
     @session.visit('/with_html')
-    @session.should have_no_text('.orem')
+    expect(@session).to have_no_text('.orem')
   end
 
   it "should wait for text to disappear", :requires => [:js] do
     @session.visit('/with_js')
     @session.click_link('Click me')
-    @session.should have_no_text("I changed it")
+    expect(@session).to have_no_text("I changed it")
   end
 
   context "with wait", :requires => [:js] do
     it "should not find element if it appears after given wait duration" do
       @session.visit('/with_js')
       @session.click_link('Click me')
-      @session.should have_no_text('Has been clicked', :wait => 0.1)
+      expect(@session).to have_no_text('Has been clicked', :wait => 0.1)
     end
   end
 end

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

@@ -4,21 +4,21 @@ Capybara::SpecHelper.spec '#has_title?' do
   end
 
   it "should be true if the page has the given title" do
-    @session.should have_title('with_js')
+    expect(@session).to have_title('with_js')
   end
 
   it "should allow regexp matches" do
-    @session.should have_title(/w[a-z]{3}_js/)
-    @session.should_not have_title(/monkey/)
+    expect(@session).to have_title(/w[a-z]{3}_js/)
+    expect(@session).not_to have_title(/monkey/)
   end
 
   it "should wait for title", :requires => [:js] do
     @session.click_link("Change title")
-    @session.should have_title("changed title")
+    expect(@session).to have_title("changed title")
   end
 
   it "should be false if the page has not the given title" do
-    @session.should_not have_title('monkey')
+    expect(@session).not_to have_title('monkey')
   end
 end
 
@@ -28,20 +28,20 @@ Capybara::SpecHelper.spec '#has_no_title?' do
   end
 
   it "should be false if the page has the given title" do
-    @session.should_not have_no_title('with_js')
+    expect(@session).not_to have_no_title('with_js')
   end
 
   it "should allow regexp matches" do
-    @session.should_not have_no_title(/w[a-z]{3}_js/)
-    @session.should have_no_title(/monkey/)
+    expect(@session).not_to have_no_title(/w[a-z]{3}_js/)
+    expect(@session).to have_no_title(/monkey/)
   end
 
   it "should wait for title to disappear", :requires => [:js] do
     @session.click_link("Change title")
-    @session.should have_no_title('with_js')
+    expect(@session).to have_no_title('with_js')
   end
 
   it "should be true if the page has not the given title" do
-    @session.should have_no_title('monkey')
+    expect(@session).to have_no_title('monkey')
   end
 end