rspec-html-matchers 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae62c873742a46c8fb8cc012dcdd382742d3c814
-  data.tar.gz: 826dbb0dd8359796f7820b8d22823459e5d6dc1d
+  metadata.gz: d61a10851ace0712b7207d446f43cde42af550c0
+  data.tar.gz: 9732c49d3720bb2b14aa3c31eff82f83c259b12b
 SHA512:
-  metadata.gz: 21f872d52bbff456fc1ea07ede21f715832a65fc91eba3810697b23dece8747e8388a7901b93cd6d80efe2b0db34c34fe9a8059f63441d521c4fab01af1df751
-  data.tar.gz: 0e689393aacbf4db06ffdcfb1069f739c85571a3c42d01619c7591972817a06b918ce464160613434f93bed47b5495aa5b74c8ff8c10f755e5d90d3d2909a63d
+  metadata.gz: 61822c3ee0067e015ca243c0c1ffd4d706febb4a0b01daf929c248229befeb9419f971b5967a46178bd3bef14e11c62757dc6e2c198141a8ed7a580315e9924c
+  data.tar.gz: 5b05ffd9c02613e165b1407eaec75784ec3944ed5cbd4e1be8306fdd946a3b4d0a96574b558cb8f1c867cd75dcf2f6e0bd99ce106e9ca826a9e88798975c1204

data/CHANGELOG.md

@@ -9,11 +9,22 @@ unreleased(TODO)
 * inteligent check comments(make sure it is not searching inside comments)
 * shouldn't show all markup in error message if it is too big
 * order matching
+* improve documentation, add more usage examples (look at changelog and code!)
 
 0.5.0
 -----
 
-* improve documentation, add more usage examples (look at changelog and code!)
+* new "expect" syntax support
+
+0.4.4
+-----
+
+* options for have_tag now support Regexp (thanks to [Ian C. Anderson](http://github.com/iancanderson))
+
+0.4.3
+-----
+
+* added license to gemspec
 
 0.4.2
 -----

data/README.md

@@ -50,7 +50,7 @@ so perharps your code produces following output:
 so you test it with following:
 
 ```ruby
-rendered.should have_tag('form', :with => { :action => '/users', :method => 'post' }) do
+expect(rendered).to have_tag('form', :with => { :action => '/users', :method => 'post' }) do
   with_tag "input", :with => { :name => "user[email]", :type => 'email' }
   with_tag "input#special_submit", :count => 1
   without_tag "h1", :text => 'unneeded tag'
@@ -66,22 +66,22 @@ Input could be any html string. Let's take a look at these examples:
 
   ```ruby
   # simple examples:
-  '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p')
-  '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag(:p)
-  '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p#qwerty')
-  '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p.qwe.rty')
+  expect('<p class="qwe rty" id="qwerty">Paragraph</p>').to have_tag('p')
+  expect('<p class="qwe rty" id="qwerty">Paragraph</p>').to have_tag(:p)
+  expect('<p class="qwe rty" id="qwerty">Paragraph</p>').to have_tag('p#qwerty')
+  expect('<p class="qwe rty" id="qwerty">Paragraph</p>').to have_tag('p.qwe.rty')
   # more complicated examples:
-  '<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>'.should have_tag('p strong')
-  '<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>'.should have_tag('p#qwerty strong')
-  '<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>'.should have_tag('p.qwe.rty strong')
+  expect('<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>').to have_tag('p strong')
+  expect('<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>').to have_tag('p#qwerty strong')
+  expect('<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>').to have_tag('p.qwe.rty strong')
   # or you can use another syntax for examples above
-  '<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>'.should have_tag('p') do
+  expect('<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>').to have_tag('p') do
     with_tag('strong')
   end
-  '<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>'.should have_tag('p#qwerty') do
+  expect('<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>').to have_tag('p#qwerty') do
     with_tag('strong')
   end
-  '<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>'.should have_tag('p.qwe.rty') do
+  expect('<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>').to have_tag('p.qwe.rty') do
     with_tag('strong')
   end
   ```
@@ -90,41 +90,41 @@ Input could be any html string. Let's take a look at these examples:
 
   ```ruby
   # all of this are equivalent:
-  '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :with => { :class => 'qwe rty' })
-  '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :with => { :class => 'rty qwe' })
-  '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :with => { :class => ['rty', 'qwe'] })
-  '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :with => { :class => ['qwe', 'rty'] })
+  expect('<p class="qwe rty" id="qwerty">Paragraph</p>').to have_tag('p', :with => { :class => 'qwe rty' })
+  expect('<p class="qwe rty" id="qwerty">Paragraph</p>').to have_tag('p', :with => { :class => 'rty qwe' })
+  expect('<p class="qwe rty" id="qwerty">Paragraph</p>').to have_tag('p', :with => { :class => ['rty', 'qwe'] })
+  expect('<p class="qwe rty" id="qwerty">Paragraph</p>').to have_tag('p', :with => { :class => ['qwe', 'rty'] })
   ```
 
   The same works with `:without`:
 
   ```ruby
   # all of this are equivalent:
-  '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :without => { :class => 'qwe rty' })
-  '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :without => { :class => 'rty qwe' })
-  '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :without => { :class => ['rty', 'qwe'] })
-  '<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :without => { :class => ['qwe', 'rty'] })
+  expect('<p class="qwe rty" id="qwerty">Paragraph</p>').to have_tag('p', :without => { :class => 'qwe rty' })
+  expect('<p class="qwe rty" id="qwerty">Paragraph</p>').to have_tag('p', :without => { :class => 'rty qwe' })
+  expect('<p class="qwe rty" id="qwerty">Paragraph</p>').to have_tag('p', :without => { :class => ['rty', 'qwe'] })
+  expect('<p class="qwe rty" id="qwerty">Paragraph</p>').to have_tag('p', :without => { :class => ['qwe', 'rty'] })
   ```
 
 * content matching:
 
   ```ruby
-  '<p> Some content&nbsphere</p>'.should have_tag('p', :text => ' Some content here')
+  expect('<p> Some content&nbsphere</p>').to have_tag('p', :text => ' Some content here')
   # or
-  '<p> Some content&nbsphere</p>'.should have_tag('p') do
+  expect('<p> Some content&nbsphere</p>').to have_tag('p') do
     with_text ' Some content here'
   end
 
-  '<p> Some content&nbsphere</p>'.should have_tag('p', :text => /Some content here/)
+  expect('<p> Some content&nbsphere</p>').to have_tag('p', :text => /Some content here/)
   # or
-  '<p> Some content&nbsphere</p>'.should have_tag('p') do
+  expect('<p> Some content&nbsphere</p>').to have_tag('p') do
     with_text /Some content here/
   end
 
   # mymock.text == 'Some content here'
-  '<p> Some content&nbsphere</p>'.should have_tag('p', :content => mymock.text)
+  expect('<p> Some content&nbsphere</p>').to have_tag('p', :content => mymock.text)
   # or
-  '<p> Some content&nbsphere</p>'.should have_tag('p') do
+  expect('<p> Some content&nbsphere</p>').to have_tag('p') do
     with_content mymock.text
   end
   ```
@@ -132,7 +132,7 @@ Input could be any html string. Let's take a look at these examples:
 * usage with capybara and cucumber:
 
   ```ruby
-  page.should have_tag( ... )
+  expect(page).to have_tag( ... )
   ```
 
 where `page` is an instance of Capybara::Session
@@ -159,6 +159,17 @@ where `page` is an instance of Capybara::Session
 
 and of course you can use the `without_` matchers (see the documentation).
 
+### rspec 1 partial backwards compatibility:
+
+you can match:
+
+```ruby
+expect(response).to have_tag('div', 'expected content')
+expect(response).to have_tag('div', /regexp matching expected content/)
+```
+
+[RSpec 1 `have_tag` documentation](http://old.rspec.info/rails/writing/views.html)
+
 More info
 ---------
 
@@ -188,7 +199,7 @@ Contributors
 MIT Licensed
 ============
 
-Copyright (c) 2011-2012 Dmitrij Mjakotnyi
+Copyright (c) 2011-2014 Dmitrij Mjakotnyi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/features/support/env.rb

@@ -9,11 +9,6 @@ class SimpleApp < Sinatra::Base
   set :public_folder, $ASSETS_DIR
 end
 
-unless ENV.has_key? 'TRAVIS'
-  Capybara.register_driver :selenium do |app|
-    Capybara::Selenium::Driver.new(app, :browser => (ENV['BROWSER'] || :chrome))
-  end
-end
 Capybara.default_driver = :selenium
 Capybara.app = SimpleApp
 

data/lib/rspec-html-matchers.rb

@@ -102,7 +102,13 @@ module RSpec
           @document     = document
         else
           @parent_scope  = document.current_scope
-          @current_scope = document.parent_scope.css(@tag)
+          @current_scope = begin
+                             document.parent_scope.css(@tag)
+                             # on jruby this produce exception if css was not found:
+                             # undefined method `decorate' for nil:NilClass
+                           rescue NoMethodError
+                             Nokogiri::XML::NodeSet.new(Nokogiri::XML::Document.new)
+                           end
           @document      = @parent_scope.to_html
         end
 
@@ -239,24 +245,24 @@ module RSpec
     # @option options [String/Regexp] :text to match tag content, could be either String or Regexp
     #
     # @example
-    #   rendered.should have_tag('div')
-    #   rendered.should have_tag('h1.header')
-    #   rendered.should have_tag('div#footer')
-    #   rendered.should have_tag('input#email', :with => { :name => 'user[email]', :type => 'email' } )
-    #   rendered.should have_tag('div', :count => 3)            # matches exactly 3 'div' tags
-    #   rendered.should have_tag('div', :count => 3..7)         # shortcut for have_tag('div', :minimum => 3, :maximum => 7)
-    #   rendered.should have_tag('div', :minimum => 3)          # matches more(or equal) than 3 'div' tags
-    #   rendered.should have_tag('div', :maximum => 3)          # matches less(or equal) than 3 'div' tags
-    #   rendered.should have_tag('p', :text => 'some content')  # will match "<p>some content</p>"
-    #   rendered.should have_tag('p', :text => /some content/i) # will match "<p>sOme cOntEnt</p>"
-    #   rendered.should have_tag('textarea', :with => {:name => 'user[description]'}, :text => "I like pie")
-    #   "<html>
+    #   expect(rendered).to have_tag('div')
+    #   expect(rendered).to have_tag('h1.header')
+    #   expect(rendered).to have_tag('div#footer')
+    #   expect(rendered).to have_tag('input#email', :with => { :name => 'user[email]', :type => 'email' } )
+    #   expect(rendered).to have_tag('div', :count => 3)            # matches exactly 3 'div' tags
+    #   expect(rendered).to have_tag('div', :count => 3..7)         # shortcut for have_tag('div', :minimum => 3, :maximum => 7)
+    #   expect(rendered).to have_tag('div', :minimum => 3)          # matches more(or equal) than 3 'div' tags
+    #   expect(rendered).to have_tag('div', :maximum => 3)          # matches less(or equal) than 3 'div' tags
+    #   expect(rendered).to have_tag('p', :text => 'some content')  # will match "<p>some content</p>"
+    #   expect(rendered).to have_tag('p', :text => /some content/i) # will match "<p>sOme cOntEnt</p>"
+    #   expect(rendered).to have_tag('textarea', :with => {:name => 'user[description]'}, :text => "I like pie")
+    #   expect("<html>
     #     <body>
     #       <h1>some html document</h1>
     #     </body>
-    #    </html>".should have_tag('body') { with_tag('h1', :text => 'some html document') }
-    #   '<div class="one two">'.should have_tag('div', :with => { :class => ['two', 'one'] })
-    #   '<div class="one two">'.should have_tag('div', :with => { :class => 'two one' })
+    #    </html>").to have_tag('body') { with_tag('h1', :text => 'some html document') }
+    #   expect('<div class="one two">').to have_tag('div', :with => { :class => ['two', 'one'] })
+    #   expect('<div class="one two">').to have_tag('div', :with => { :class => 'two one' })
     def have_tag tag, options={}, &block
       # for backwards compatibility with rpecs have tag:
       options = { :text => options } if options.kind_of?(String) || options.kind_of?(Regexp)
@@ -267,14 +273,14 @@ module RSpec
       raise StandardError, 'this matcher should be used inside "have_tag" matcher block' unless defined?(@__current_scope_for_nokogiri_matcher)
       raise ArgumentError, 'this matcher does not accept block' if block_given?
       tag = @__current_scope_for_nokogiri_matcher.instance_variable_get(:@tag)
-      @__current_scope_for_nokogiri_matcher.should have_tag(tag, :text => text)
+      expect(@__current_scope_for_nokogiri_matcher).to have_tag(tag, :text => text)
     end
 
     def without_text text
       raise StandardError, 'this matcher should be used inside "have_tag" matcher block' unless defined?(@__current_scope_for_nokogiri_matcher)
       raise ArgumentError, 'this matcher does not accept block' if block_given?
       tag = @__current_scope_for_nokogiri_matcher.instance_variable_get(:@tag)
-      @__current_scope_for_nokogiri_matcher.should_not have_tag(tag, :text => text)
+      expect(@__current_scope_for_nokogiri_matcher).to_not have_tag(tag, :text => text)
     end
     alias :but_without_text :without_text
 
@@ -283,7 +289,7 @@ module RSpec
     # @see #have_tag
     # @note this should be used within block of have_tag matcher
     def with_tag tag, options={}, &block
-      @__current_scope_for_nokogiri_matcher.should have_tag(tag, options, &block)
+      expect(@__current_scope_for_nokogiri_matcher).to have_tag(tag, options, &block)
     end
 
     # without_tag matcher
@@ -291,7 +297,7 @@ module RSpec
     # @see #have_tag
     # @note this should be used within block of have_tag matcher
     def without_tag tag, options={}, &block
-      @__current_scope_for_nokogiri_matcher.should_not have_tag(tag, options, &block)
+      expect(@__current_scope_for_nokogiri_matcher).to_not have_tag(tag, options, &block)
     end
 
     # form assertion
@@ -415,13 +421,13 @@ module RSpec
     def with_text_area name#TODO, text=nil
       #options = form_tag_options('text',name,value)
       options = { :with => { :name => name } }
-      @__current_scope_for_nokogiri_matcher.should have_tag('textarea', options)
+      expect(@__current_scope_for_nokogiri_matcher).to have_tag('textarea', options)
     end
 
     def without_text_area name#TODO, text=nil
       #options = form_tag_options('text',name,value)
       options = { :with => { :name => name } }
-      @__current_scope_for_nokogiri_matcher.should_not have_tag('textarea', options)
+      expect(@__current_scope_for_nokogiri_matcher).to_not have_tag('textarea', options)
     end
 
     def with_checkbox name, value=nil
@@ -449,7 +455,7 @@ module RSpec
       id = options[:with].delete(:id)
       tag='select'; tag << '#'+id if id
       options[:with].merge!(:name => name)
-      @__current_scope_for_nokogiri_matcher.should have_tag(tag, options, &block)
+      expect(@__current_scope_for_nokogiri_matcher).to have_tag(tag, options, &block)
     end
 
     def without_select name, options={}, &block
@@ -457,7 +463,7 @@ module RSpec
       id = options[:with].delete(:id)
       tag='select'; tag << '#'+id if id
       options[:with].merge!(:name => name)
-      @__current_scope_for_nokogiri_matcher.should_not have_tag(tag, options, &block)
+      expect(@__current_scope_for_nokogiri_matcher).to_not have_tag(tag, options, &block)
     end
 
     def with_option text, value=nil, options={}
@@ -473,7 +479,7 @@ module RSpec
       end
       options.delete(:selected)
       options.merge!(:text => text) if text
-      @__current_scope_for_nokogiri_matcher.should have_tag(tag, options)
+      expect(@__current_scope_for_nokogiri_matcher).to have_tag(tag, options)
     end
 
     def without_option text, value=nil, options={}
@@ -489,7 +495,7 @@ module RSpec
       end
       options.delete(:selected)
       options.merge!(:text => text) if text
-      @__current_scope_for_nokogiri_matcher.should_not have_tag(tag, options)
+      expect(@__current_scope_for_nokogiri_matcher).to_not have_tag(tag, options)
     end
 
     def with_button text, value=nil, options={}
@@ -500,7 +506,7 @@ module RSpec
       end
       options[:with].merge!(:value => value.to_s) if value
       options.merge!(:text => text) if text
-      @__current_scope_for_nokogiri_matcher.should have_tag('button', options)
+      expect(@__current_scope_for_nokogiri_matcher).to have_tag('button', options)
     end
 
     def without_button text, value=nil, options={}
@@ -511,7 +517,7 @@ module RSpec
       end
       options[:with].merge!(:value => value.to_s) if value
       options.merge!(:text => text) if text
-      @__current_scope_for_nokogiri_matcher.should_not have_tag('button', options)
+      expect(@__current_scope_for_nokogiri_matcher).to_not have_tag('button', options)
     end
 
     def with_submit value
@@ -529,11 +535,11 @@ module RSpec
     private
 
     def should_have_input(options)
-      @__current_scope_for_nokogiri_matcher.should have_tag('input', options)
+      expect(@__current_scope_for_nokogiri_matcher).to have_tag('input', options)
     end
 
     def should_not_have_input(options)
-      @__current_scope_for_nokogiri_matcher.should_not have_tag('input', options)
+      expect(@__current_scope_for_nokogiri_matcher).to_not have_tag('input', options)
     end
 
     # form_tag in method name name mean smth. like input, submit, tags that should appear in a form

data/spec/fixtures/form.html

@@ -133,6 +133,7 @@
     <ol>
       <li class="commit">
         <input class="create" id="book_submit" name="commit" type="submit" value="Create Book" />
+        <button>Cancel Book</button>
       </li>
     </ol>
   </fieldset>

data/spec/{matchers/form_matchers_spec.rb → form_matchers_spec.rb}

@@ -5,54 +5,50 @@ describe "have_form" do
 
   context "without &block" do
     it "should find form" do
-      rendered.should have_form("/books", :post) # just to make sure it just works
-      # params checking:
-      self.should_receive(:have_tag).with("form#new_book", :with => { :method => "post", :action => "/books", :class => %w(book formtastic) })
-      rendered.should have_form("/books", "post", :with => { :id => "new_book", :class => %w(book formtastic) })
+      # sanity check
+      expect(rendered).to have_form("/books", :post)
+      expect(rendered).to have_form("/books", "post", with: { id: "new_book", class: %w(book formtastic) })
     end
 
     it "should not find form" do
-      rendered.should_not have_form("/some_url", :post)
-      rendered.should_not have_form("/books", :get)
+      expect(rendered).to_not have_form("/some_url", :post)
+      expect(rendered).to_not have_form("/books", :get)
     end
   end
 
   context "with &block" do
     context "with_select" do
       it "should find select" do
-        rendered.should have_form("/books", :post) do
-          with_select("book[publisher_id]", :with => { :id => "book_publisher_id" })
-          self.should_receive(:have_tag).with("select#book_publisher_id", :with => { :name => "book[publisher_id]" })
-          with_select("book[publisher_id]", :with => { :id => "book_publisher_id" })
+        expect(rendered).to have_form("/books", :post) do
+          with_select("book[publisher_id]", with: { id: "book_publisher_id" })
+          with_select("book[publisher_id]", with: { id: "book_publisher_id" })
         end
       end
 
       it "should not find select" do
-        rendered.should have_form("/books", :post) do
-          without_select("book[publisher_id]", :with => { :id => "other_id" })
-          self.should_receive(:have_tag).with("select#book_publisher_id", :with => { :name => "koob[publisher_id]" })
-          without_select("koob[publisher_id]", :with => { :id => "book_publisher_id" })
+        expect(rendered).to have_form("/books", :post) do
+          without_select("book[publisher_id]", with: { id: "other_id" })
+          without_select("koob[publisher_id]", with: { id: "book_publisher_id" })
         end
       end
 
       context "with_option" do
         it "should find options" do
-          rendered.should have_form("/books", :post) do
+          expect(rendered).to have_form("/books", :post) do
             with_select("book[publisher_id]") do
               with_option(nil)
-              with_option("The Pragmatic Bookshelf", :selected => true)
+              with_option("The Pragmatic Bookshelf", selected: true)
               with_option(/sitepoint/,2)
-              self.should_receive(:have_tag).with('option', :with => { :value => '3' }, :text => "O'Reilly")
-              with_option("O'Reilly", 3, :selected => false)
+              with_option("O'Reilly", 3, selected: false)
             end
           end
         end
 
         it "should not find options" do
-          rendered.should have_form("/books", :post) do
+          expect(rendered).to have_form("/books", :post) do
             with_select("book[publisher_id]") do
               without_option("blah blah")
-              without_option("O'Reilly", 3, :selected => true)
+              without_option("O'Reilly", 3, selected: true)
               without_option("O'Reilly", 100500)
             end
           end
@@ -61,15 +57,14 @@ describe "have_form" do
 
       context "with_button" do
         it "should find button" do
-          rendered.should have_form("/books", :post) do
-            self.should_receive(:have_tag).with('button', :with => {}, :text => "Cancel Book")
+          expect(rendered).to have_form("/books", :post) do
             with_button("Cancel Book")
           end
         end
 
         it "should not find button" do
-          rendered.should have_form("/books", :post) do
-            without_button("Cancel Book")
+          expect(rendered).to have_form("/books", :post) do
+            without_button("Create Book")
           end
         end
       end
@@ -77,19 +72,14 @@ describe "have_form" do
 
     context "with_hidden_field" do
       it "should find hidden field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           with_hidden_field("authenticity_token")
-          self.should_receive(:have_tag).with('input', :with => {
-            :name => 'authenticity_token',
-            :type => 'hidden',
-            :value => '718WaH76RAbIVhDlnOidgew62ikn8IUCOyWLEqjw1GE='
-          })
           with_hidden_field("authenticity_token", '718WaH76RAbIVhDlnOidgew62ikn8IUCOyWLEqjw1GE=')
         end
       end
 
       it "should not find hidden field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           without_hidden_field('user_id')
           without_hidden_field('authenticity_token', 'blabla')
         end
@@ -98,7 +88,7 @@ describe "have_form" do
 
     context "with_text_field" do
       it "should find text field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           with_text_field('book[title]')
           with_text_field('book[title]',nil)
           with_text_field('book[author]','Authorname')
@@ -106,7 +96,7 @@ describe "have_form" do
       end
 
       it "should not find text field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           without_text_field('book[title]','title does not exist')
           without_text_field('book[authoRR]')
           without_text_field('book[blabla]')
@@ -116,7 +106,7 @@ describe "have_form" do
 
     context "with_email_field" do
       it "should find email field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           with_email_field('user[email]')
           with_email_field('user[email]', 'email@example.com')
           with_email_field('user[email_confirmation]', nil)
@@ -124,7 +114,7 @@ describe "have_form" do
       end
 
       it "should not find email field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           without_email_field('book[author]','Authorname')
           without_email_field('user[emaiL]')
           without_email_field('user[apocalyptiq]')
@@ -134,14 +124,14 @@ describe "have_form" do
 
     context "with_url_field" do
       it "should find url field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           with_url_field('user[url]')
           with_url_field('user[url]', 'http://user.com')
         end
       end
 
       it "should not find url field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           without_url_field('user[url]','Authorname')
           without_url_field('user[emaiL]')
           without_url_field('user[apocalyptiq]')
@@ -151,7 +141,7 @@ describe "have_form" do
 
     context "with_number_field" do
       it "should find number field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           with_number_field('number')
           with_number_field('number_defined', 3)
           with_number_field('number_defined', '3')
@@ -159,7 +149,7 @@ describe "have_form" do
       end
 
       it "should not find number field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           without_number_field('number',400)
           without_number_field('number','400')
           without_number_field('user[emaiL]')
@@ -170,29 +160,29 @@ describe "have_form" do
 
     context "with_range_field" do
       it "should find range field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           with_range_field('range1', 1, 3)
           with_range_field('range1','1','3')
-          with_range_field('range2', 1, 3, :with => { :value => 2 } )
-          with_range_field('range2', 1, 3, :with => { :value => '2' } )
+          with_range_field('range2', 1, 3, with: { value: 2 } )
+          with_range_field('range2', 1, 3, with: { value: '2' } )
         end
       end
 
       it "should not find range field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           without_range_field('number')
           without_range_field('range1', 1, 5)
-          without_range_field('range2', 1, 3, :with => { :value => 5 } )
+          without_range_field('range2', 1, 3, with: { value: 5 } )
         end
       end
     end
 
     context "with_date_field" do
       it "should find date field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           with_date_field(:date)
           with_date_field(:date, 'book_date')
-          with_date_field(:month, 'book_month', :with => { :value => 5 })
+          with_date_field(:month, 'book_month', with: { value: 5 })
           with_date_field(:week,'book_week')
           with_date_field(:time, 'book_time')
           with_date_field(:datetime, 'book_datetime')
@@ -201,20 +191,20 @@ describe "have_form" do
       end
 
       it "should not find date field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           without_date_field(:date, 'book_something')
-          without_date_field(:month, 'book_month', :with => { :value => 100500 })
+          without_date_field(:month, 'book_month', with: { value: 100500 })
         end
       end
 
       it "should raise exception if wrong date field type specified" do
         expect do
-          rendered.should have_form("/books", :post) do
+          expect(rendered).to have_form("/books", :post) do
             without_date_field(:unknown, 'book_something')
           end
         end.to raise_error('unknown type `unknown` for date picker')
         expect do
-          rendered.should have_form("/books", :post) do
+          expect(rendered).to have_form("/books", :post) do
             with_date_field(:unknown, 'book_something')
           end
         end.to raise_error('unknown type `unknown` for date picker')
@@ -223,13 +213,13 @@ describe "have_form" do
 
     context "with_password_field" do
       it "should find password field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           with_password_field('user[password]')
         end
       end
 
       it "should not find password field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           without_password_field('account[password]')
         end
       end
@@ -237,13 +227,13 @@ describe "have_form" do
 
     context "with_file_field" do
       it "should find file field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           with_file_field('form[file]')
         end
       end
 
       it "should not find file field" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           without_file_field('user[file]')
         end
       end
@@ -251,13 +241,13 @@ describe "have_form" do
 
     context "with_text_area" do
       it "should find text area" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           with_text_area('book[description]')
         end
       end
 
       it "should not find text area" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           without_text_area('user[bio]')
         end
       end
@@ -265,14 +255,14 @@ describe "have_form" do
 
     context "with_check_box" do
       it "should find check box" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           with_checkbox("book[still_in_print]")
           with_checkbox("book[still_in_print]","1")
         end
       end
 
       it "should not find check box" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           without_checkbox("book[book]")
           without_checkbox("book[still_in_print]","500")
         end
@@ -281,13 +271,13 @@ describe "have_form" do
 
     context "with_radio_button" do
       it "should find radio button" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           with_radio_button("form[name]","true")
         end
       end
 
       it "should not find radio button" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           without_radio_button("form[name]","100500")
           without_radio_button("form[item]","false")
         end
@@ -296,13 +286,13 @@ describe "have_form" do
 
     context "with_submit" do
       it "should find submit" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           with_submit("Create Book")
         end
       end
 
       it "should not find submit" do
-        rendered.should have_form("/books", :post) do
+        expect(rendered).to have_form("/books", :post) do
           without_submit("Destroy Book")
         end
       end