capybara 2.2.1 → 2.3.0

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

@@ -1,10 +1,10 @@
 Capybara::SpecHelper.spec '#go_back', :requires => [:js] do
   it "should fetch a response from the driver from the previous page" do
     @session.visit('/')
-    @session.should have_content('Hello world!')
+    expect(@session).to have_content('Hello world!')
     @session.visit('/foo')
-    @session.should have_content('Another World')
+    expect(@session).to have_content('Another World')
     @session.go_back
-    @session.should have_content('Hello world!')
+    expect(@session).to have_content('Hello world!')
   end
 end

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

@@ -1,12 +1,12 @@
 Capybara::SpecHelper.spec '#go_forward', :requires => [:js] do
   it "should fetch a response from the driver from the previous page" do
     @session.visit('/')
-    @session.should have_content('Hello world!')
+    expect(@session).to have_content('Hello world!')
     @session.visit('/foo')
-    @session.should have_content('Another World')
+    expect(@session).to have_content('Another World')
     @session.go_back
-    @session.should have_content('Hello world!')
+    expect(@session).to have_content('Hello world!')
     @session.go_forward
-    @session.should have_content('Another World')
+    expect(@session).to have_content('Another World')
   end
 end

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

@@ -4,25 +4,25 @@ Capybara::SpecHelper.spec '#has_button?' do
   end
 
   it "should be true if the given button is on the page" do
-    @session.should have_button('med')
-    @session.should have_button('crap321')
-    @session.should have_button(:'crap321')
+    expect(@session).to have_button('med')
+    expect(@session).to have_button('crap321')
+    expect(@session).to have_button(:'crap321')
   end
 
   it "should be true for disabled buttons if :disabled => true" do
-    @session.should have_button('Disabled button', :disabled => true)
+    expect(@session).to have_button('Disabled button', :disabled => true)
   end
 
   it "should be false if the given button is not on the page" do
-    @session.should_not have_button('monkey')
+    expect(@session).not_to have_button('monkey')
   end
 
   it "should be false for disabled buttons by default" do
-    @session.should_not have_button('Disabled button')
+    expect(@session).not_to have_button('Disabled button')
   end
 
   it "should be false for disabled buttons if :disabled => false" do
-    @session.should_not have_button('Disabled button', :disabled => false)
+    expect(@session).not_to have_button('Disabled button', :disabled => false)
   end
 end
 
@@ -32,23 +32,23 @@ Capybara::SpecHelper.spec '#has_no_button?' do
   end
 
   it "should be true if the given button is on the page" do
-    @session.should_not have_no_button('med')
-    @session.should_not have_no_button('crap321')
+    expect(@session).not_to have_no_button('med')
+    expect(@session).not_to have_no_button('crap321')
   end
 
   it "should be true for disabled buttons if :disabled => true" do
-    @session.should_not have_no_button('Disabled button', :disabled => true)
+    expect(@session).not_to have_no_button('Disabled button', :disabled => true)
   end
 
   it "should be false if the given button is not on the page" do
-    @session.should have_no_button('monkey')
+    expect(@session).to have_no_button('monkey')
   end
 
   it "should be false for disabled buttons by default" do
-    @session.should have_no_button('Disabled button')
+    expect(@session).to have_no_button('Disabled button')
   end
 
   it "should be false for disabled buttons if :disabled => false" do
-    @session.should have_no_button('Disabled button', :disabled => false)
+    expect(@session).to have_no_button('Disabled button', :disabled => false)
   end
 end

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

@@ -4,111 +4,111 @@ Capybara::SpecHelper.spec '#has_css?' do
   end
 
   it "should be true if the given selector is on the page" do
-    @session.should have_css("p")
-    @session.should have_css("p a#foo")
+    expect(@session).to have_css("p")
+    expect(@session).to have_css("p a#foo")
   end
 
   it "should be false if the given selector is not on the page" do
-    @session.should_not have_css("abbr")
-    @session.should_not have_css("p a#doesnotexist")
-    @session.should_not have_css("p.nosuchclass")
+    expect(@session).not_to have_css("abbr")
+    expect(@session).not_to have_css("p a#doesnotexist")
+    expect(@session).not_to have_css("p.nosuchclass")
   end
 
   it "should respect scopes" do
     @session.within "//p[@id='first']" do
-      @session.should have_css("a#foo")
-      @session.should_not have_css("a#red")
+      expect(@session).to have_css("a#foo")
+      expect(@session).not_to have_css("a#red")
     end
   end
 
   it "should wait for content to appear", :requires => [:js] do
     @session.visit('/with_js')
     @session.click_link('Click me')
-    @session.should have_css("input[type='submit'][value='New Here']")
+    expect(@session).to have_css("input[type='submit'][value='New Here']")
   end
 
   context "with between" do
     it "should be true if the content occurs within the range given" do
-      @session.should have_css("p", :between => 1..4)
-      @session.should have_css("p a#foo", :between => 1..3)
-      @session.should have_css("p a.doesnotexist", :between => 0..8)
+      expect(@session).to have_css("p", :between => 1..4)
+      expect(@session).to have_css("p a#foo", :between => 1..3)
+      expect(@session).to have_css("p a.doesnotexist", :between => 0..8)
     end
 
     it "should be false if the content occurs more or fewer times than range" do
-      @session.should_not have_css("p", :between => 6..11 )
-      @session.should_not have_css("p a#foo", :between => 4..7)
-      @session.should_not have_css("p a.doesnotexist", :between => 3..8)
+      expect(@session).not_to have_css("p", :between => 6..11 )
+      expect(@session).not_to have_css("p a#foo", :between => 4..7)
+      expect(@session).not_to have_css("p a.doesnotexist", :between => 3..8)
     end
   end
 
   context "with count" do
     it "should be true if the content occurs the given number of times" do
-      @session.should have_css("p", :count => 3)
-      @session.should have_css("p a#foo", :count => 1)
-      @session.should have_css("p a.doesnotexist", :count => 0)
+      expect(@session).to have_css("p", :count => 3)
+      expect(@session).to have_css("p a#foo", :count => 1)
+      expect(@session).to have_css("p a.doesnotexist", :count => 0)
     end
 
     it "should be false if the content occurs a different number of times than the given" do
-      @session.should_not have_css("p", :count => 6)
-      @session.should_not have_css("p a#foo", :count => 2)
-      @session.should_not have_css("p a.doesnotexist", :count => 1)
+      expect(@session).not_to have_css("p", :count => 6)
+      expect(@session).not_to have_css("p a#foo", :count => 2)
+      expect(@session).not_to have_css("p a.doesnotexist", :count => 1)
     end
 
     it "should coerce count to an integer" do
-      @session.should have_css("p", :count => "3")
-      @session.should have_css("p a#foo", :count => "1")
+      expect(@session).to have_css("p", :count => "3")
+      expect(@session).to have_css("p a#foo", :count => "1")
     end
   end
 
   context "with maximum" do
     it "should be true when content occurs same or fewer times than given" do
-      @session.should have_css("h2.head", :maximum => 5) # edge case
-      @session.should have_css("h2", :maximum => 10)
-      @session.should have_css("p a.doesnotexist", :maximum => 1)
-      @session.should have_css("p a.doesnotexist", :maximum => 0)
+      expect(@session).to have_css("h2.head", :maximum => 5) # edge case
+      expect(@session).to have_css("h2", :maximum => 10)
+      expect(@session).to have_css("p a.doesnotexist", :maximum => 1)
+      expect(@session).to have_css("p a.doesnotexist", :maximum => 0)
     end
 
     it "should be false when content occurs more times than given" do
-      @session.should_not have_css("h2.head", :maximum => 4) # edge case
-      @session.should_not have_css("h2", :maximum => 3)
-      @session.should_not have_css("p", :maximum => 1)
+      expect(@session).not_to have_css("h2.head", :maximum => 4) # edge case
+      expect(@session).not_to have_css("h2", :maximum => 3)
+      expect(@session).not_to have_css("p", :maximum => 1)
     end
 
     it "should coerce maximum to an integer" do
-      @session.should have_css("h2.head", :maximum => "5") # edge case
-      @session.should have_css("h2", :maximum => "10")
+      expect(@session).to have_css("h2.head", :maximum => "5") # edge case
+      expect(@session).to have_css("h2", :maximum => "10")
     end
   end
 
   context "with minimum" do
     it "should be true when content occurs same or more times than given" do
-      @session.should have_css("h2.head", :minimum => 5) # edge case
-      @session.should have_css("h2", :minimum => 3)
-      @session.should have_css("p a.doesnotexist", :minimum => 0)
+      expect(@session).to have_css("h2.head", :minimum => 5) # edge case
+      expect(@session).to have_css("h2", :minimum => 3)
+      expect(@session).to have_css("p a.doesnotexist", :minimum => 0)
     end
 
     it "should be false when content occurs fewer times than given" do
-      @session.should_not have_css("h2.head", :minimum => 6) # edge case
-      @session.should_not have_css("h2", :minimum => 8)
-      @session.should_not have_css("p", :minimum => 10)
-      @session.should_not have_css("p a.doesnotexist", :minimum => 1)
+      expect(@session).not_to have_css("h2.head", :minimum => 6) # edge case
+      expect(@session).not_to have_css("h2", :minimum => 8)
+      expect(@session).not_to have_css("p", :minimum => 10)
+      expect(@session).not_to have_css("p a.doesnotexist", :minimum => 1)
     end
 
     it "should coerce minimum to an integer" do
-      @session.should have_css("h2.head", :minimum => "5") # edge case
-      @session.should have_css("h2", :minimum => "3")
+      expect(@session).to have_css("h2.head", :minimum => "5") # edge case
+      expect(@session).to have_css("h2", :minimum => "3")
     end
   end
 
   context "with text" do
     it "should discard all matches where the given string is not contained" do
-      @session.should have_css("p a", :text => "Redirect", :count => 1)
-      @session.should_not have_css("p a", :text => "Doesnotexist")
+      expect(@session).to have_css("p a", :text => "Redirect", :count => 1)
+      expect(@session).not_to have_css("p a", :text => "Doesnotexist")
     end
 
     it "should discard all matches where the given regexp is not matched" do
-      @session.should have_css("p a", :text => /re[dab]i/i, :count => 1)
-      @session.should_not have_css("p a", :text => /Red$/)
+      expect(@session).to have_css("p a", :text => /re[dab]i/i, :count => 1)
+      expect(@session).not_to have_css("p a", :text => /Red$/)
     end
   end
 end
@@ -119,110 +119,110 @@ Capybara::SpecHelper.spec '#has_no_css?' do
   end
 
   it "should be false if the given selector is on the page" do
-    @session.should_not have_no_css("p")
-    @session.should_not have_no_css("p a#foo")
+    expect(@session).not_to have_no_css("p")
+    expect(@session).not_to have_no_css("p a#foo")
   end
 
   it "should be true if the given selector is not on the page" do
-    @session.should have_no_css("abbr")
-    @session.should have_no_css("p a#doesnotexist")
-    @session.should have_no_css("p.nosuchclass")
+    expect(@session).to have_no_css("abbr")
+    expect(@session).to have_no_css("p a#doesnotexist")
+    expect(@session).to have_no_css("p.nosuchclass")
   end
 
   it "should respect scopes" do
     @session.within "//p[@id='first']" do
-      @session.should_not have_no_css("a#foo")
-      @session.should have_no_css("a#red")
+      expect(@session).not_to have_no_css("a#foo")
+      expect(@session).to have_no_css("a#red")
     end
   end
 
   it "should wait for content to disappear", :requires => [:js] do
     @session.visit('/with_js')
     @session.click_link('Click me')
-    @session.should have_no_css("p#change")
+    expect(@session).to have_no_css("p#change")
   end
 
   context "with between" do
     it "should be false if the content occurs within the range given" do
-      @session.should_not have_no_css("p", :between => 1..4)
-      @session.should_not have_no_css("p a#foo", :between => 1..3)
-      @session.should_not have_no_css("p a.doesnotexist", :between => 0..2)
+      expect(@session).not_to have_no_css("p", :between => 1..4)
+      expect(@session).not_to have_no_css("p a#foo", :between => 1..3)
+      expect(@session).not_to have_no_css("p a.doesnotexist", :between => 0..2)
     end
 
     it "should be true if the content occurs more or fewer times than range" do
-      @session.should have_no_css("p", :between => 6..11 )
-      @session.should have_no_css("p a#foo", :between => 4..7)
-      @session.should have_no_css("p a.doesnotexist", :between => 3..8)
+      expect(@session).to have_no_css("p", :between => 6..11 )
+      expect(@session).to have_no_css("p a#foo", :between => 4..7)
+      expect(@session).to have_no_css("p a.doesnotexist", :between => 3..8)
     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_css("p", :count => 3)
-      @session.should_not have_no_css("p a#foo", :count => 1)
-      @session.should_not have_no_css("p a.doesnotexist", :count => 0)
+      expect(@session).not_to have_no_css("p", :count => 3)
+      expect(@session).not_to have_no_css("p a#foo", :count => 1)
+      expect(@session).not_to have_no_css("p a.doesnotexist", :count => 0)
     end
 
     it "should be true if the content is on the page the given number of times" do
-      @session.should have_no_css("p", :count => 6)
-      @session.should have_no_css("p a#foo", :count => 2)
-      @session.should have_no_css("p a.doesnotexist", :count => 1)
+      expect(@session).to have_no_css("p", :count => 6)
+      expect(@session).to have_no_css("p a#foo", :count => 2)
+      expect(@session).to have_no_css("p a.doesnotexist", :count => 1)
     end
 
     it "should coerce count to an integer" do
-      @session.should_not have_no_css("p", :count => "3")
-      @session.should_not have_no_css("p a#foo", :count => "1")
+      expect(@session).not_to have_no_css("p", :count => "3")
+      expect(@session).not_to have_no_css("p a#foo", :count => "1")
     end
   end
 
   context "with maximum" do
     it "should be false when content occurs same or fewer times than given" do
-      @session.should_not have_no_css("h2.head", :maximum => 5) # edge case
-      @session.should_not have_no_css("h2", :maximum => 10)
-      @session.should_not have_no_css("p a.doesnotexist", :maximum => 0)
+      expect(@session).not_to have_no_css("h2.head", :maximum => 5) # edge case
+      expect(@session).not_to have_no_css("h2", :maximum => 10)
+      expect(@session).not_to have_no_css("p a.doesnotexist", :maximum => 0)
     end
 
     it "should be true when content occurs more times than given" do
-      @session.should have_no_css("h2.head", :maximum => 4) # edge case
-      @session.should have_no_css("h2", :maximum => 3)
-      @session.should have_no_css("p", :maximum => 1)
+      expect(@session).to have_no_css("h2.head", :maximum => 4) # edge case
+      expect(@session).to have_no_css("h2", :maximum => 3)
+      expect(@session).to have_no_css("p", :maximum => 1)
     end
 
     it "should coerce maximum to an integer" do
-      @session.should_not have_no_css("h2.head", :maximum => "5") # edge case
-      @session.should_not have_no_css("h2", :maximum => "10")
+      expect(@session).not_to have_no_css("h2.head", :maximum => "5") # edge case
+      expect(@session).not_to have_no_css("h2", :maximum => "10")
     end
   end
 
   context "with minimum" do
     it "should be false when content occurs same or more times than given" do
-      @session.should_not have_no_css("h2.head", :minimum => 5) # edge case
-      @session.should_not have_no_css("h2", :minimum => 3)
-      @session.should_not have_no_css("p a.doesnotexist", :minimum => 0)
+      expect(@session).not_to have_no_css("h2.head", :minimum => 5) # edge case
+      expect(@session).not_to have_no_css("h2", :minimum => 3)
+      expect(@session).not_to have_no_css("p a.doesnotexist", :minimum => 0)
     end
 
     it "should be true when content occurs fewer times than given" do
-      @session.should have_no_css("h2.head", :minimum => 6) # edge case
-      @session.should have_no_css("h2", :minimum => 8)
-      @session.should have_no_css("p", :minimum => 15)
-      @session.should have_no_css("p a.doesnotexist", :minimum => 1)
+      expect(@session).to have_no_css("h2.head", :minimum => 6) # edge case
+      expect(@session).to have_no_css("h2", :minimum => 8)
+      expect(@session).to have_no_css("p", :minimum => 15)
+      expect(@session).to have_no_css("p a.doesnotexist", :minimum => 1)
     end
 
     it "should coerce minimum to an integer" do
-      @session.should_not have_no_css("h2.head", :minimum => "4") # edge case
-      @session.should_not have_no_css("h2", :minimum => "3")
+      expect(@session).not_to have_no_css("h2.head", :minimum => "4") # edge case
+      expect(@session).not_to have_no_css("h2", :minimum => "3")
     end
   end
 
   context "with text" do
     it "should discard all matches where the given string is not contained" do
-      @session.should_not have_no_css("p a", :text => "Redirect", :count => 1)
-      @session.should have_no_css("p a", :text => "Doesnotexist")
+      expect(@session).not_to have_no_css("p a", :text => "Redirect", :count => 1)
+      expect(@session).to have_no_css("p a", :text => "Doesnotexist")
     end
 
     it "should discard all matches where the given regexp is not matched" do
-      @session.should_not have_no_css("p a", :text => /re[dab]i/i, :count => 1)
-      @session.should have_no_css("p a", :text => /Red$/)
+      expect(@session).not_to have_no_css("p a", :text => /re[dab]i/i, :count => 1)
+      expect(@session).to have_no_css("p a", :text => /Red$/)
     end
   end
 end

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

@@ -2,56 +2,56 @@ Capybara::SpecHelper.spec '#has_field' do
   before { @session.visit('/form') }
 
   it "should be true if the field is on the page" do
-    @session.should have_field('Dog')
-    @session.should have_field('form_description')
-    @session.should have_field('Region')
-    @session.should have_field(:'Region')
+    expect(@session).to have_field('Dog')
+    expect(@session).to have_field('form_description')
+    expect(@session).to have_field('Region')
+    expect(@session).to have_field(:'Region')
   end
 
   it "should be false if the field is not on the page" do
-    @session.should_not have_field('Monkey')
+    expect(@session).not_to have_field('Monkey')
   end
 
   context 'with value' do
     it "should be true if a field with the given value is on the page" do
-      @session.should have_field('First Name', :with => 'John')
-      @session.should have_field('Phone', :with => '+1 555 7021')
-      @session.should have_field('Street', :with => 'Sesame street 66')
-      @session.should have_field('Description', :with => 'Descriptive text goes here')
+      expect(@session).to have_field('First Name', :with => 'John')
+      expect(@session).to have_field('Phone', :with => '+1 555 7021')
+      expect(@session).to have_field('Street', :with => 'Sesame street 66')
+      expect(@session).to have_field('Description', :with => 'Descriptive text goes here')
     end
 
     it "should be false if the given field is not on the page" do
-      @session.should_not have_field('First Name', :with => 'Peter')
-      @session.should_not have_field('Wrong Name', :with => 'John')
-      @session.should_not have_field('Description', :with => 'Monkey')
+      expect(@session).not_to have_field('First Name', :with => 'Peter')
+      expect(@session).not_to have_field('Wrong Name', :with => 'John')
+      expect(@session).not_to have_field('Description', :with => 'Monkey')
     end
 
     it "should be true after the field has been filled in with the given value" do
       @session.fill_in('First Name', :with => 'Jonas')
-      @session.should have_field('First Name', :with => 'Jonas')
+      expect(@session).to have_field('First Name', :with => 'Jonas')
     end
 
     it "should be false after the field has been filled in with a different value" do
       @session.fill_in('First Name', :with => 'Jonas')
-      @session.should_not have_field('First Name', :with => 'John')
+      expect(@session).not_to have_field('First Name', :with => 'John')
     end
   end
 
   context 'with type' do
     it "should be true if a field with the given type is on the page" do
-      @session.should have_field('First Name', :type => 'text')
-      @session.should have_field('Html5 Email', :type => 'email')
-      @session.should have_field('Html5 Tel', :type => 'tel')
-      @session.should have_field('Description', :type => 'textarea')
-      @session.should have_field('Languages', :type => 'select')
+      expect(@session).to have_field('First Name', :type => 'text')
+      expect(@session).to have_field('Html5 Email', :type => 'email')
+      expect(@session).to have_field('Html5 Tel', :type => 'tel')
+      expect(@session).to have_field('Description', :type => 'textarea')
+      expect(@session).to have_field('Languages', :type => 'select')
     end
 
     it "should be false if the given field is not on the page" do
-      @session.should_not have_field('First Name', :type => 'textarea')
-      @session.should_not have_field('Html5 Email', :type => 'tel')
-      @session.should_not have_field('Description', :type => '')
-      @session.should_not have_field('Description', :type => 'email')
-      @session.should_not have_field('Languages', :type => 'textarea')
+      expect(@session).not_to have_field('First Name', :type => 'textarea')
+      expect(@session).not_to have_field('Html5 Email', :type => 'tel')
+      expect(@session).not_to have_field('Description', :type => '')
+      expect(@session).not_to have_field('Description', :type => 'email')
+      expect(@session).not_to have_field('Languages', :type => 'textarea')
     end
   end
 end
@@ -60,55 +60,55 @@ Capybara::SpecHelper.spec '#has_no_field' do
   before { @session.visit('/form') }
 
   it "should be false if the field is on the page" do
-    @session.should_not have_no_field('Dog')
-    @session.should_not have_no_field('form_description')
-    @session.should_not have_no_field('Region')
+    expect(@session).not_to have_no_field('Dog')
+    expect(@session).not_to have_no_field('form_description')
+    expect(@session).not_to have_no_field('Region')
   end
 
   it "should be true if the field is not on the page" do
-    @session.should have_no_field('Monkey')
+    expect(@session).to have_no_field('Monkey')
   end
 
   context 'with value' do
     it "should be false if a field with the given value is on the page" do
-      @session.should_not have_no_field('First Name', :with => 'John')
-      @session.should_not have_no_field('Phone', :with => '+1 555 7021')
-      @session.should_not have_no_field('Street', :with => 'Sesame street 66')
-      @session.should_not have_no_field('Description', :with => 'Descriptive text goes here')
+      expect(@session).not_to have_no_field('First Name', :with => 'John')
+      expect(@session).not_to have_no_field('Phone', :with => '+1 555 7021')
+      expect(@session).not_to have_no_field('Street', :with => 'Sesame street 66')
+      expect(@session).not_to have_no_field('Description', :with => 'Descriptive text goes here')
     end
 
     it "should be true if the given field is not on the page" do
-      @session.should have_no_field('First Name', :with => 'Peter')
-      @session.should have_no_field('Wrong Name', :with => 'John')
-      @session.should have_no_field('Description', :with => 'Monkey')
+      expect(@session).to have_no_field('First Name', :with => 'Peter')
+      expect(@session).to have_no_field('Wrong Name', :with => 'John')
+      expect(@session).to have_no_field('Description', :with => 'Monkey')
     end
 
     it "should be false after the field has been filled in with the given value" do
       @session.fill_in('First Name', :with => 'Jonas')
-      @session.should_not have_no_field('First Name', :with => 'Jonas')
+      expect(@session).not_to have_no_field('First Name', :with => 'Jonas')
     end
 
     it "should be true after the field has been filled in with a different value" do
       @session.fill_in('First Name', :with => 'Jonas')
-      @session.should have_no_field('First Name', :with => 'John')
+      expect(@session).to have_no_field('First Name', :with => 'John')
     end
   end
 
   context 'with type' do
     it "should be false if a field with the given type is on the page" do
-      @session.should_not have_no_field('First Name', :type => 'text')
-      @session.should_not have_no_field('Html5 Email', :type => 'email')
-      @session.should_not have_no_field('Html5 Tel', :type => 'tel')
-      @session.should_not have_no_field('Description', :type => 'textarea')
-      @session.should_not have_no_field('Languages', :type => 'select')
+      expect(@session).not_to have_no_field('First Name', :type => 'text')
+      expect(@session).not_to have_no_field('Html5 Email', :type => 'email')
+      expect(@session).not_to have_no_field('Html5 Tel', :type => 'tel')
+      expect(@session).not_to have_no_field('Description', :type => 'textarea')
+      expect(@session).not_to have_no_field('Languages', :type => 'select')
     end
 
     it "should be true if the given field is not on the page" do
-      @session.should have_no_field('First Name', :type => 'textarea')
-      @session.should have_no_field('Html5 Email', :type => 'tel')
-      @session.should have_no_field('Description', :type => '')
-      @session.should have_no_field('Description', :type => 'email')
-      @session.should have_no_field('Languages', :type => 'textarea')
+      expect(@session).to have_no_field('First Name', :type => 'textarea')
+      expect(@session).to have_no_field('Html5 Email', :type => 'tel')
+      expect(@session).to have_no_field('Description', :type => '')
+      expect(@session).to have_no_field('Description', :type => 'email')
+      expect(@session).to have_no_field('Languages', :type => 'textarea')
     end
   end
 end
@@ -117,49 +117,49 @@ Capybara::SpecHelper.spec '#has_checked_field?' do
   before { @session.visit('/form') }
 
   it "should be true if a checked field is on the page" do
-    @session.should have_checked_field('gender_female')
-    @session.should have_checked_field('Hamster')
+    expect(@session).to have_checked_field('gender_female')
+    expect(@session).to have_checked_field('Hamster')
   end
 
   it "should be true for disabled checkboxes if :disabled => true" do
-    @session.should have_checked_field('Disabled Checkbox', :disabled => true)
+    expect(@session).to have_checked_field('Disabled Checkbox', :disabled => true)
   end
 
   it "should be false if an unchecked field is on the page" do
-    @session.should_not have_checked_field('form_pets_cat')
-    @session.should_not have_checked_field('Male')
+    expect(@session).not_to have_checked_field('form_pets_cat')
+    expect(@session).not_to have_checked_field('Male')
   end
 
   it "should be false if no field is on the page" do
-    @session.should_not have_checked_field('Does Not Exist')
+    expect(@session).not_to have_checked_field('Does Not Exist')
   end
 
   it "should be false for disabled checkboxes by default" do
-    @session.should_not have_checked_field('Disabled Checkbox')
+    expect(@session).not_to have_checked_field('Disabled Checkbox')
   end
 
   it "should be false for disabled checkboxes if :disabled => false" do
-    @session.should_not have_checked_field('Disabled Checkbox', :disabled => false)
+    expect(@session).not_to have_checked_field('Disabled Checkbox', :disabled => false)
   end
 
   it "should be true after an unchecked checkbox is checked" do
     @session.check('form_pets_cat')
-    @session.should have_checked_field('form_pets_cat')
+    expect(@session).to have_checked_field('form_pets_cat')
   end
 
   it "should be false after a checked checkbox is unchecked" do
     @session.uncheck('form_pets_dog')
-    @session.should_not have_checked_field('form_pets_dog')
+    expect(@session).not_to have_checked_field('form_pets_dog')
   end
 
   it "should be true after an unchecked radio button is chosen" do
     @session.choose('gender_male')
-    @session.should have_checked_field('gender_male')
+    expect(@session).to have_checked_field('gender_male')
   end
 
   it "should be false after another radio button in the group is chosen" do
     @session.choose('gender_male')
-    @session.should_not have_checked_field('gender_female')
+    expect(@session).not_to have_checked_field('gender_female')
   end
 end
 
@@ -167,29 +167,29 @@ Capybara::SpecHelper.spec '#has_no_checked_field?' do
   before { @session.visit('/form') }
 
   it "should be false if a checked field is on the page" do
-    @session.should_not have_no_checked_field('gender_female')
-    @session.should_not have_no_checked_field('Hamster')
+    expect(@session).not_to have_no_checked_field('gender_female')
+    expect(@session).not_to have_no_checked_field('Hamster')
   end
 
   it "should be false for disabled checkboxes if :disabled => true" do
-    @session.should_not have_no_checked_field('Disabled Checkbox', :disabled => true)
+    expect(@session).not_to have_no_checked_field('Disabled Checkbox', :disabled => true)
   end
 
   it "should be true if an unchecked field is on the page" do
-    @session.should have_no_checked_field('form_pets_cat')
-    @session.should have_no_checked_field('Male')
+    expect(@session).to have_no_checked_field('form_pets_cat')
+    expect(@session).to have_no_checked_field('Male')
   end
 
   it "should be true if no field is on the page" do
-    @session.should have_no_checked_field('Does Not Exist')
+    expect(@session).to have_no_checked_field('Does Not Exist')
   end
 
   it "should be true for disabled checkboxes by default" do
-    @session.should have_no_checked_field('Disabled Checkbox')
+    expect(@session).to have_no_checked_field('Disabled Checkbox')
   end
 
   it "should be true for disabled checkboxes if :disabled => false" do
-    @session.should have_no_checked_field('Disabled Checkbox', :disabled => false)
+    expect(@session).to have_no_checked_field('Disabled Checkbox', :disabled => false)
   end
 end
 
@@ -197,49 +197,49 @@ Capybara::SpecHelper.spec '#has_unchecked_field?' do
   before { @session.visit('/form') }
 
   it "should be false if a checked field is on the page" do
-    @session.should_not have_unchecked_field('gender_female')
-    @session.should_not have_unchecked_field('Hamster')
+    expect(@session).not_to have_unchecked_field('gender_female')
+    expect(@session).not_to have_unchecked_field('Hamster')
   end
 
   it "should be true if an unchecked field is on the page" do
-    @session.should have_unchecked_field('form_pets_cat')
-    @session.should have_unchecked_field('Male')
+    expect(@session).to have_unchecked_field('form_pets_cat')
+    expect(@session).to have_unchecked_field('Male')
   end
 
   it "should be true for disabled unchecked fields if :disabled => true" do
-    @session.should have_unchecked_field('Disabled Unchecked Checkbox', :disabled => true)
+    expect(@session).to have_unchecked_field('Disabled Unchecked Checkbox', :disabled => true)
   end
 
   it "should be false if no field is on the page" do
-    @session.should_not have_unchecked_field('Does Not Exist')
+    expect(@session).not_to have_unchecked_field('Does Not Exist')
   end
 
   it "should be false for disabled unchecked fields by default" do
-    @session.should_not have_unchecked_field('Disabled Unchecked Checkbox')
+    expect(@session).not_to have_unchecked_field('Disabled Unchecked Checkbox')
   end
 
   it "should be false for disabled unchecked fields if :disabled => false" do
-    @session.should_not have_unchecked_field('Disabled Unchecked Checkbox', :disabled => false)
+    expect(@session).not_to have_unchecked_field('Disabled Unchecked Checkbox', :disabled => false)
   end
 
   it "should be false after an unchecked checkbox is checked" do
     @session.check('form_pets_cat')
-    @session.should_not have_unchecked_field('form_pets_cat')
+    expect(@session).not_to have_unchecked_field('form_pets_cat')
   end
 
   it "should be true after a checked checkbox is unchecked" do
     @session.uncheck('form_pets_dog')
-    @session.should have_unchecked_field('form_pets_dog')
+    expect(@session).to have_unchecked_field('form_pets_dog')
   end
 
   it "should be false after an unchecked radio button is chosen" do
     @session.choose('gender_male')
-    @session.should_not have_unchecked_field('gender_male')
+    expect(@session).not_to have_unchecked_field('gender_male')
   end
 
   it "should be true after another radio button in the group is chosen" do
     @session.choose('gender_male')
-    @session.should have_unchecked_field('gender_female')
+    expect(@session).to have_unchecked_field('gender_female')
   end
 end
 
@@ -247,28 +247,28 @@ Capybara::SpecHelper.spec '#has_no_unchecked_field?' do
   before { @session.visit('/form') }
 
   it "should be true if a checked field is on the page" do
-    @session.should have_no_unchecked_field('gender_female')
-    @session.should have_no_unchecked_field('Hamster')
+    expect(@session).to have_no_unchecked_field('gender_female')
+    expect(@session).to have_no_unchecked_field('Hamster')
   end
 
   it "should be false if an unchecked field is on the page" do
-    @session.should_not have_no_unchecked_field('form_pets_cat')
-    @session.should_not have_no_unchecked_field('Male')
+    expect(@session).not_to have_no_unchecked_field('form_pets_cat')
+    expect(@session).not_to have_no_unchecked_field('Male')
   end
 
   it "should be false for disabled unchecked fields if :disabled => true" do
-    @session.should_not have_no_unchecked_field('Disabled Unchecked Checkbox', :disabled => true)
+    expect(@session).not_to have_no_unchecked_field('Disabled Unchecked Checkbox', :disabled => true)
   end
 
   it "should be true if no field is on the page" do
-    @session.should have_no_unchecked_field('Does Not Exist')
+    expect(@session).to have_no_unchecked_field('Does Not Exist')
   end
 
   it "should be true for disabled unchecked fields by default" do
-    @session.should have_no_unchecked_field('Disabled Unchecked Checkbox')
+    expect(@session).to have_no_unchecked_field('Disabled Unchecked Checkbox')
   end
 
   it "should be true for disabled unchecked fields if :disabled => false" do
-    @session.should have_no_unchecked_field('Disabled Unchecked Checkbox', :disabled => false)
+    expect(@session).to have_no_unchecked_field('Disabled Unchecked Checkbox', :disabled => false)
   end
 end