padrino-helpers 0.13.3.2 → 0.13.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0905e2192dbffe4b6b0e5a2f3d6fa8451c3f2e37
-  data.tar.gz: 8e65ca6a317a2ccc2512671423ea3248f275ecab
+  metadata.gz: 39d68a01385de986830de4f80c5d3fbe5bff78a3
+  data.tar.gz: 85b1ba0dbf9d4989d912fc1acfe6e04ea91ebc58
 SHA512:
-  metadata.gz: ac494771259b27964318c3bc2111bd24a24a65a44fdc9246ed50ac6a5e39ec292cb599b269a60af6a512504c11b94cdf585bbddb59ff7cac060533cd4afd6bb1
-  data.tar.gz: 5cb1ad45218af0441a30ad84ff369c3f3ceb816704183bb87bf9df1199d27777cc8f1df297246d351845965c96ef105b6677e5d33c687e0eda1e30366c1decee
+  metadata.gz: 3ceec9f9f045bacfd711a51983c45c69be56db194249c1227756ea5b4394ca7a51cbc38b8f185e883b54677b97fa51f7ada0669ec7f3aadabbe4f9fa28844f36
+  data.tar.gz: 07db632d89473ee8e9fc836b92d507adf69776b88ae9e4a893a415d19a639565547119425805b2468693c811539a1bc28ee3a348dce1f2537619af56b770e806

data/README.rdoc

@@ -53,7 +53,7 @@ to the template through the use of <tt>concat_content</tt>. Note have been built
 templates using the same syntax.
 
 For more information on using output helpers, check out the guide for
-{Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers].
+{Padrino Helpers}[http://padrinorb.com/guides/application-helpers/output-helpers/].
 
 === Tag Helpers
 
@@ -74,7 +74,7 @@ The input_tag is used to build tags that are related to accepting input from the
 Note that all of these accept html options and result in returning a string containing html tags.
 
 For more information on using tag helpers, check out the guide for
-{Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers].
+{Padrino Helpers}[http://padrinorb.com/guides/application-helpers/tag-helpers/].
 
 === Asset Helpers
 
@@ -95,7 +95,7 @@ simple view template:
     %p= image_tag 'padrino.png', :width => '35', :class => 'logo'
 
 For more information on using asset helpers, check out the guide for
-{Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers].
+{Padrino Helpers}[http://padrinorb.com/guides/application-helpers/asset-helpers/].
 
 === Form Helpers
 
@@ -120,7 +120,7 @@ example of constructing a non-object form would be:
       = submit_tag "Remove"
 
 For more information on using form helpers, check out the guide for
-{Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers].
+{Padrino Helpers}[http://padrinorb.com/guides/application-helpers/form-helpers/].
 
 === FormBuilders
 
@@ -153,7 +153,7 @@ A form_for using these basic fields might look like:
     %p
       = f.submit "Create", :class => 'button'
 
-Forms can also accept nested attributes using `fields_for` within the form builder in recent releases. Check out the guide for {Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers] to learn more about nested forms.
+Forms can also accept nested attributes using `fields_for` within the form builder in recent releases. Check out the guide for {Padrino Helpers}[http://padrinorb.com/guides/application-helpers/form-builders/] to learn more about nested forms.
 
 There is also an additional StandardFormBuilder which builds on the abstract fields that can be used within a form_for.
 
@@ -179,7 +179,7 @@ and would generate this html (with each input contained in a paragraph and conta
 You can also easily build your own FormBuilder which allows for customized fields and behavior.
 
 For more information on using the Padrino form builders, check out the guide for
-{Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers].
+{Padrino Helpers}[http://padrinorb.com/guides/application-helpers/standard-form-builder/].
 
 === Format Helpers
 
@@ -207,7 +207,7 @@ Format helpers also includes a number of useful text manipulation functions such
 These helpers can be invoked from any route or view within your application.
 
 For more information on using the format helpers, check out the guide for
-{Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers].
+{Padrino Helpers}[http://padrinorb.com/guides/application-helpers/format-helpers/].
 
 === Render Helpers
 
@@ -232,7 +232,7 @@ Finally, we have the all-important partials support for rendering mini-templates
   partial 'photo/_item', :collection => @photos
 
 For more information on using the render and partial helpers, check out the guide for
-{Padrino Helpers}[http://www.padrinorb.com/guides/application-helpers].
+{Padrino Helpers}[http://padrinorb.com/guides/application-helpers/render-helpers/].
 
 == Copyright
 

data/test/helper.rb

@@ -4,7 +4,6 @@ require 'minitest/autorun'
 require 'minitest/pride'
 require 'mocha/setup'
 require 'rack/test'
-require 'webrat'
 require 'builder'
 require 'padrino-helpers'
 require 'padrino/rendering'
@@ -13,18 +12,14 @@ require 'tilt/builder'
 
 require 'ext/minitest-spec'
 require 'ext/rack-test-methods'
+require 'padrino/test-methods'
 
 class MiniTest::Spec
   include Padrino::Helpers::OutputHelpers
   include Padrino::Helpers::TagHelpers
   include Padrino::Helpers::AssetTagHelpers
   include Rack::Test::Methods
-  include Webrat::Methods
-  include Webrat::Matchers
-
-  Webrat.configure do |config|
-    config.mode = :rack
-  end
+  include Padrino::TestMethods
 
   def stop_time_for_test
     time = Time.now
@@ -80,11 +75,3 @@ class MiniTest::Spec
     Rack::Lint.new(@app)
   end
 end
-
-module Webrat
-  module Logging
-    def logger # @private
-      @logger = nil
-    end
-  end
-end

data/test/test_asset_tag_helpers.rb

@@ -14,107 +14,109 @@ describe "AssetTagHelpers" do
 
   describe 'for #flash_tag method' do
     it 'should display flash with no given attributes' do
-      assert_has_tag('div.notice', :content => "Demo notice") { flash_tag(:notice) }
+      assert_html_has_tag(flash_tag(:notice), 'div.notice', :content => "Demo notice")
     end
     it 'should display flash with given attributes' do
       actual_html = flash_tag(:notice, :class => 'notice', :id => 'notice-area')
-      assert_has_tag('div.notice#notice-area', :content => "Demo notice") { actual_html }
+      assert_html_has_tag(actual_html, 'div.notice#notice-area', :content => "Demo notice")
     end
     it 'should display multiple flash tags with given attributes' do
       flash[:error] = 'wrong'
       flash[:success] = 'okey'
       actual_html = flash_tag(:success, :warning, :error, :id => 'area')
-      assert_has_tag('div.success#area', :content => flash[:success]) { actual_html }
-      assert_has_tag('div.error#area', :content => flash[:error]) { actual_html }
-      assert_has_no_tag('div.warning') { actual_html }
+      assert_html_has_tag(actual_html, 'div.success#area', :content => flash[:success])
+      assert_html_has_tag(actual_html, 'div.error#area', :content => flash[:error])
+      assert_html_has_no_tag(actual_html, 'div.warning')
     end
   end
 
   describe 'for #link_to method' do
     it 'should display link element with no given attributes' do
-      assert_has_tag('a', :content => "Sign up", :href => '/register') { link_to('Sign up', '/register') }
+      assert_html_has_tag(link_to('Sign up', '/register'), 'a', :content => "Sign up", :href => '/register')
     end
 
     it 'should display link element with given attributes' do
       actual_html = link_to('Sign up', '/register', :class => 'first', :id => 'linky')
-      assert_has_tag('a#linky.first', :content => "Sign up", :href => '/register') { actual_html }
+      assert_html_has_tag(actual_html, 'a#linky.first', :content => "Sign up", :href => '/register')
     end
 
     it 'should display link element with void url and options' do
       actual_link = link_to('Sign up', :class => "test")
-      assert_has_tag('a', :content => "Sign up", :href => '#', :class => 'test') { actual_link }
+      assert_html_has_tag(actual_link, 'a', :content => "Sign up", :href => '#', :class => 'test')
     end
 
     it 'should display link element with remote option' do
       actual_link = link_to('Sign up', '/register', :remote => true)
-      assert_has_tag('a', :content => "Sign up", :href => '/register', 'data-remote' => 'true') { actual_link }
+      assert_html_has_tag(actual_link, 'a', :content => "Sign up", :href => '/register', 'data-remote' => 'true')
     end
 
     it 'should display link element with method option' do
       actual_link = link_to('Sign up', '/register', :method => :delete)
-      assert_has_tag('a', :content => "Sign up", :href => '/register', 'data-method' => 'delete', :rel => 'nofollow') { actual_link }
+      assert_html_has_tag(actual_link, 'a', :content => "Sign up", :href => '/register', 'data-method' => 'delete', :rel => 'nofollow')
     end
 
     it 'should display link element with confirm option' do
       actual_link = link_to('Sign up', '/register', :confirm => "Are you sure?")
-      assert_has_tag('a', :content => "Sign up", :href => '/register', 'data-confirm' => 'Are you sure?') { actual_link }
+      assert_html_has_tag(actual_link, 'a', :content => "Sign up", :href => '/register', 'data-confirm' => 'Are you sure?')
     end
 
     it 'should display link element with ruby block' do
       actual_link = link_to('/register', :class => 'first', :id => 'binky') { "Sign up" }
-      assert_has_tag('a#binky.first', :content => "Sign up", :href => '/register') { actual_link }
+      assert_html_has_tag(actual_link, 'a#binky.first', :content => "Sign up", :href => '/register')
     end
 
     it 'should escape the link text' do
       actual_link = link_to('/register', :class => 'first', :id => 'binky') { "<&>" }
-      assert_has_tag('a#binky.first', :href => '/register') { actual_link }
+      assert_html_has_tag(actual_link, 'a#binky.first', :href => '/register')
       assert_match "&lt;&amp;&gt;", actual_link
     end
 
     it 'should escape the link href' do
       actual_link = link_to('Sign up', '/register new%20user')
-      assert_has_tag('a', :href => '/register%20new%20user') { actual_link }
+      assert_html_has_tag(actual_link, 'a', :href => '/register%20new%20user')
     end
 
     it 'should not escape image_tag' do
       actual_link = link_to(image_tag("/my/fancy/image.png"), :class => 'first', :id => 'binky')
-      assert_has_tag('img', :src => "/my/fancy/image.png") { actual_link }
+      assert_html_has_tag(actual_link, 'img', :src => "/my/fancy/image.png")
     end
 
     it 'should render alt text by default' do
       actual_tag = image_tag("/my/fancy/image.png")
-      assert_has_tag('img', :src => "/my/fancy/image.png", :alt => "Image") { actual_tag }
+      assert_html_has_tag(actual_tag, 'img', :src => "/my/fancy/image.png", :alt => "Image")
+    end
 
+    it 'should render humanized alt text' do
       actual_tag = image_tag("/my/fancy/image_white.png")
-      assert_has_tag('img', :src => "/my/fancy/image_white.png", :alt => "Image white") { actual_tag }
+      assert_html_has_tag(actual_tag, 'img', :src => "/my/fancy/image_white.png", :alt => "Image white")
     end
 
     it 'should remove hash value from src path' do
       actual_tag = image_tag("/my/fancy/sprite-47bce5c74f589f4867dbd57e9ca9f808.png")
-      assert_has_tag('img', :src => "/my/fancy/sprite-47bce5c74f589f4867dbd57e9ca9f808.png", :alt => "Sprite") { actual_tag }
+      assert_html_has_tag(actual_tag, 'img', :src => "/my/fancy/sprite-47bce5c74f589f4867dbd57e9ca9f808.png", :alt => "Sprite")
     end
 
     it 'should display link block element in haml' do
-      visit '/haml/link_to'
-      assert_have_selector :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
-      assert_have_selector :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
+      get "/haml/link_to"
+      assert_response_has_tag :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
+      assert_response_has_tag :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
     end
 
     it 'should display link block element in erb' do
-      visit '/erb/link_to'
-      assert_have_selector :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
-      assert_have_selector :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
+      get "/erb/link_to"
+      assert_response_has_tag :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
+      assert_response_has_tag :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
     end
 
     it 'should display link block element in slim' do
-      visit '/slim/link_to'
-      assert_have_selector :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
-      assert_have_selector :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
+      get "/slim/link_to"
+      assert_response_has_tag :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
+      assert_response_has_tag :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
     end
 
     it 'should not double-escape' do
       actual_link = link_to('test escape', '?a=1&b=2')
-      assert_has_tag('a', :href => '?a=1&b=2') { actual_link }
+      assert_html_has_tag(actual_link, 'a', :href => '?a=1&b=2')
       assert_match %r{&amp;}, actual_link
       refute_match %r{&amp;amp;}, actual_link
     end
@@ -128,17 +130,17 @@ describe "AssetTagHelpers" do
   describe 'for #mail_to method' do
     it 'should display link element for mail to no caption' do
       actual_html = mail_to('test@demo.com')
-      assert_has_tag(:a, :href => "mailto:test@demo.com", :content => 'test@demo.com') { actual_html }
+      assert_html_has_tag(actual_html, :a, :href => "mailto:test@demo.com", :content => 'test@demo.com')
     end
 
     it 'should display link element for mail to with caption' do
       actual_html = mail_to('test@demo.com', "My Email", :class => 'demo')
-      assert_has_tag(:a, :href => "mailto:test@demo.com", :content => 'My Email', :class => 'demo') { actual_html }
+      assert_html_has_tag(actual_html, :a, :href => "mailto:test@demo.com", :content => 'My Email', :class => 'demo')
     end
 
     it 'should display link element for mail to with caption and mail options' do
       actual_html = mail_to('test@demo.com', "My Email", :subject => 'demo test', :class => 'demo', :cc => 'foo@test.com')
-      assert_has_tag(:a, :class => 'demo') { actual_html }
+      assert_html_has_tag(actual_html, :a, :class => 'demo')
       assert_match %r{mailto\:test\@demo.com\?}, actual_html
       assert_match %r{cc=foo\@test\.com}, actual_html
       assert_match %r{subject\=demo\%20test}, actual_html
@@ -152,92 +154,87 @@ describe "AssetTagHelpers" do
 
     it 'should not double-escape ampersands in query' do
       actual_html = mail_to('to@demo.com', "Email", :bcc => 'bcc@test.com', :subject => 'Hi there')
-      assert_has_tag(:a, :href => 'mailto:to@demo.com?bcc=bcc@test.com&subject=Hi%20there', :content => 'Email') { actual_html }
+      assert_html_has_tag(actual_html, :a, :href => 'mailto:to@demo.com?bcc=bcc@test.com&subject=Hi%20there', :content => 'Email')
       assert_match %r{&amp;}, actual_html
       refute_match %r{&amp;amp;}, actual_html
     end
 
     it 'should display mail link element in haml' do
-      visit '/haml/mail_to'
-      assert_have_selector 'p.simple a', :href => 'mailto:test@demo.com', :content => 'test@demo.com'
-      assert_have_selector 'p.captioned a', :href => 'mailto:test@demo.com', :content => 'Click my Email'
+      get "/haml/mail_to"
+      assert_response_has_tag 'p.simple a', :href => 'mailto:test@demo.com', :content => 'test@demo.com'
+      assert_response_has_tag 'p.captioned a', :href => 'mailto:test@demo.com', :content => 'Click my Email'
     end
 
     it 'should display mail link element in erb' do
-      visit '/erb/mail_to'
-      assert_have_selector 'p.simple a', :href => 'mailto:test@demo.com', :content => 'test@demo.com'
-      assert_have_selector 'p.captioned a', :href => 'mailto:test@demo.com', :content => 'Click my Email'
+      get "/erb/mail_to"
+      assert_response_has_tag 'p.simple a', :href => 'mailto:test@demo.com', :content => 'test@demo.com'
+      assert_response_has_tag 'p.captioned a', :href => 'mailto:test@demo.com', :content => 'Click my Email'
     end
 
     it 'should display mail link element in slim' do
-      visit '/slim/mail_to'
-      assert_have_selector 'p.simple a', :href => 'mailto:test@demo.com', :content => 'test@demo.com'
-      assert_have_selector 'p.captioned a', :href => 'mailto:test@demo.com', :content => 'Click my Email'
+      get "/slim/mail_to"
+      assert_response_has_tag 'p.simple a', :href => 'mailto:test@demo.com', :content => 'test@demo.com'
+      assert_response_has_tag 'p.captioned a', :href => 'mailto:test@demo.com', :content => 'Click my Email'
     end
   end
 
   describe 'for #meta_tag method' do
     it 'should display meta tag with given content and name' do
       actual_html = meta_tag("weblog,news", :name => "keywords")
-      assert_has_tag("meta", :name => "keywords", "content" => "weblog,news") { actual_html }
+      assert_html_has_tag(actual_html, "meta", :name => "keywords", :content => "weblog,news")
     end
 
     it 'should display meta tag with given content and http-equiv' do
       actual_html = meta_tag("text/html; charset=UTF-8", :"http-equiv" => "Content-Type")
-      assert_has_tag("meta", :"http-equiv" => "Content-Type", "content" => "text/html; charset=UTF-8") { actual_html }
+      assert_html_has_tag(actual_html, "meta", :"http-equiv" => "Content-Type", :content => "text/html; charset=UTF-8")
     end
 
     it 'should display meta tag element in haml' do
-      visit '/haml/meta_tag'
-      assert_have_selector 'meta', "content" => "weblog,news", :name => "keywords"
-      assert_have_selector 'meta', "content" => "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"
+      get "/haml/meta_tag"
+      assert_response_has_tag 'meta', :content => "weblog,news", :name => "keywords"
+      assert_response_has_tag 'meta', :content => "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"
     end
 
     it 'should display meta tag element in erb' do
-      visit '/erb/meta_tag'
-      assert_have_selector 'meta', "content" => "weblog,news", :name => "keywords"
-      assert_have_selector 'meta', "content" => "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"
+      get "/erb/meta_tag"
+      assert_response_has_tag 'meta', :content => "weblog,news", :name => "keywords"
+      assert_response_has_tag 'meta', :content => "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"
     end
 
     it 'should display meta tag element in slim' do
-      visit '/slim/meta_tag'
-      assert_have_selector 'meta', "content" => "weblog,news", :name => "keywords"
-      assert_have_selector 'meta', "content" => "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"
+      get "/slim/meta_tag"
+      assert_response_has_tag 'meta', :content => "weblog,news", :name => "keywords"
+      assert_response_has_tag 'meta', :content => "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"
     end
   end
 
   describe 'for #image_tag method' do
     it 'should display image tag absolute link with no options' do
-      time = stop_time_for_test
-      assert_has_tag('img', :src => "/absolute/pic.gif") { image_tag('/absolute/pic.gif') }
+      assert_html_has_tag(image_tag('/absolute/pic.gif'), 'img', :src => "/absolute/pic.gif")
     end
 
     it 'should display image tag relative link with specified uri root' do
       time = stop_time_for_test
       self.class.stubs(:uri_root).returns("/blog")
-      assert_has_tag('img', :src => "/blog/images/relative/pic.gif?#{time.to_i}") { image_tag('relative/pic.gif') }
+      assert_html_has_tag(image_tag('relative/pic.gif'), 'img', :src => "/blog/images/relative/pic.gif?#{time.to_i}")
     end
 
     it 'should display image tag relative link with options' do
       time = stop_time_for_test
-      assert_has_tag('img.photo', :src => "/images/relative/pic.gif?#{time.to_i}") {
-        image_tag('relative/pic.gif', :class => 'photo') }
+      assert_html_has_tag(image_tag('relative/pic.gif', :class => 'photo'), 'img.photo', :src => "/images/relative/pic.gif?#{time.to_i}")
     end
 
     it 'should display image tag uri link with options' do
-      time = stop_time_for_test
-      assert_has_tag('img.photo', :src => "http://demo.org/pic.gif") { image_tag('http://demo.org/pic.gif', :class => 'photo') }
+      assert_html_has_tag(image_tag('http://demo.org/pic.gif', :class => 'photo'), 'img.photo', :src => "http://demo.org/pic.gif")
     end
 
     it 'should display image tag relative link with incorrect spacing' do
       time = stop_time_for_test
-      assert_has_tag('img.photo', :src => "/images/%20relative/%20pic.gif%20%20?#{time.to_i}") {
-        image_tag(' relative/ pic.gif  ', :class => 'photo')
-      }
+      assert_html_has_tag(image_tag(' relative/ pic.gif  ', :class => 'photo'), 'img.photo', :src => "/images/%20relative/%20pic.gif%20%20?#{time.to_i}")
     end
 
     it 'should not use a timestamp if stamp setting is false' do
-      assert_has_tag('img', :src => "/absolute/pic.gif") { image_tag('/absolute/pic.gif') }
+      assert_html_has_tag(image_tag('/absolute/pic.gif'), 'img', :src => "/absolute/pic.gif")
     end
 
     it 'should have xhtml convention tag' do
@@ -250,7 +247,7 @@ describe "AssetTagHelpers" do
       time = stop_time_for_test
       actual_html = stylesheet_link_tag('style')
       expected_options = { :rel => "stylesheet", :type => "text/css" }
-      assert_has_tag('link', expected_options.merge(:href => "/stylesheets/style.css?#{time.to_i}")) { actual_html }
+      assert_html_has_tag(actual_html, 'link', expected_options.merge(:href => "/stylesheets/style.css?#{time.to_i}"))
       assert actual_html.html_safe?
     end
 
@@ -258,14 +255,14 @@ describe "AssetTagHelpers" do
       time = stop_time_for_test
       expected_options = { :rel => "stylesheet", :type => "text/css" }
       actual_html = stylesheet_link_tag('example/demo/style')
-      assert_has_tag('link', expected_options.merge(:href => "/stylesheets/example/demo/style.css?#{time.to_i}")) { actual_html }
+      assert_html_has_tag(actual_html, 'link', expected_options.merge(:href => "/stylesheets/example/demo/style.css?#{time.to_i}"))
     end
 
     it 'should display stylesheet link item with absolute path' do
       time = stop_time_for_test
       expected_options = { :rel => "stylesheet", :type => "text/css" }
       actual_html = stylesheet_link_tag('/css/style')
-      assert_has_tag('link', expected_options.merge(:href => "/css/style.css")) { actual_html }
+      assert_html_has_tag(actual_html, 'link', expected_options.merge(:href => "/css/style.css"))
     end
 
     it 'should display stylesheet link item with uri root' do
@@ -273,27 +270,27 @@ describe "AssetTagHelpers" do
       time = stop_time_for_test
       expected_options = { :rel => "stylesheet", :type => "text/css" }
       actual_html = stylesheet_link_tag('style')
-      assert_has_tag('link', expected_options.merge(:href => "/blog/stylesheets/style.css?#{time.to_i}")) { actual_html }
+      assert_html_has_tag(actual_html, 'link', expected_options.merge(:href => "/blog/stylesheets/style.css?#{time.to_i}"))
     end
 
     it 'should display stylesheet link items' do
       time = stop_time_for_test
       actual_html = stylesheet_link_tag('style', 'layout.css', 'http://google.com/style.css')
-      assert_has_tag('link', :rel => "stylesheet", :type => "text/css", :count => 3) { actual_html }
-      assert_has_tag('link', :href => "/stylesheets/style.css?#{time.to_i}") { actual_html }
-      assert_has_tag('link', :href => "/stylesheets/layout.css?#{time.to_i}") { actual_html }
-      assert_has_tag('link', :href => "http://google.com/style.css") { actual_html }
+      assert_html_has_tag(actual_html, 'link', :rel => "stylesheet", :type => "text/css", :count => 3)
+      assert_html_has_tag(actual_html, 'link', :href => "/stylesheets/style.css?#{time.to_i}")
+      assert_html_has_tag(actual_html, 'link', :href => "/stylesheets/layout.css?#{time.to_i}")
+      assert_html_has_tag(actual_html, 'link', :href => "http://google.com/style.css")
       assert_equal actual_html, stylesheet_link_tag(['style', 'layout.css', 'http://google.com/style.css'])
     end
 
     it 'should not use a timestamp if stamp setting is false' do
       self.class.expects(:asset_stamp).returns(false)
       expected_options = { :rel => "stylesheet", :type => "text/css" }
-      assert_has_tag('link', expected_options.merge(:href => "/stylesheets/style.css")) { stylesheet_link_tag('style') }
+      assert_html_has_tag(stylesheet_link_tag('style'), 'link', expected_options.merge(:href => "/stylesheets/style.css"))
     end
 
     it 'should display stylesheet link used custom options' do
-      assert_has_tag('link', :rel => 'stylesheet', :media => 'screen') { stylesheet_link_tag('style', :media => 'screen') }
+      assert_html_has_tag(stylesheet_link_tag('style', :media => 'screen'), 'link', :rel => 'stylesheet', :media => 'screen')
     end
   end
 
@@ -301,7 +298,7 @@ describe "AssetTagHelpers" do
     it 'should display javascript item' do
       time = stop_time_for_test
       actual_html = javascript_include_tag('application')
-      assert_has_tag('script', :src => "/javascripts/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+      assert_html_has_tag(actual_html, 'script', :src => "/javascripts/application.js?#{time.to_i}", :type => "text/javascript")
       assert actual_html.html_safe?
     end
 
@@ -310,60 +307,58 @@ describe "AssetTagHelpers" do
       self.class.stubs(:js_asset_folder).returns('js')
       assert_equal 'js', asset_folder_name(:js)
       actual_html = javascript_include_tag('application')
-      assert_has_tag('script', :src => "/js/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+      assert_html_has_tag(actual_html, 'script', :src => "/js/application.js?#{time.to_i}", :type => "text/javascript")
     end
 
     it 'should display javascript item for long relative path' do
       time = stop_time_for_test
       actual_html = javascript_include_tag('example/demo/application')
-      assert_has_tag('script', :src => "/javascripts/example/demo/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+      assert_html_has_tag(actual_html, 'script', :src => "/javascripts/example/demo/application.js?#{time.to_i}", :type => "text/javascript")
     end
 
     it 'should display javascript item for path containing js' do
       time = stop_time_for_test
       actual_html = javascript_include_tag 'test/jquery.json'
-      assert_has_tag('script', :src => "/javascripts/test/jquery.json?#{time.to_i}", :type => "text/javascript") { actual_html }
+      assert_html_has_tag(actual_html, 'script', :src => "/javascripts/test/jquery.json?#{time.to_i}", :type => "text/javascript")
     end
 
     it 'should display javascript item for path containing period' do
       time = stop_time_for_test
       actual_html = javascript_include_tag 'test/jquery.min'
-      assert_has_tag('script', :src => "/javascripts/test/jquery.min.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+      assert_html_has_tag(actual_html, 'script', :src => "/javascripts/test/jquery.min.js?#{time.to_i}", :type => "text/javascript")
     end
 
     it 'should display javascript item with absolute path' do
-      time = stop_time_for_test
       actual_html = javascript_include_tag('/js/application')
-      assert_has_tag('script', :src => "/js/application.js", :type => "text/javascript") { actual_html }
+      assert_html_has_tag(actual_html, 'script', :src => "/js/application.js", :type => "text/javascript")
     end
 
     it 'should display javascript item with uri root' do
       self.class.stubs(:uri_root).returns("/blog")
       time = stop_time_for_test
       actual_html = javascript_include_tag('application')
-      assert_has_tag('script', :src => "/blog/javascripts/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+      assert_html_has_tag(actual_html, 'script', :src => "/blog/javascripts/application.js?#{time.to_i}", :type => "text/javascript")
     end
 
     it 'should not append extension to absolute paths' do
-      time = stop_time_for_test
       actual_html = javascript_include_tag('https://maps.googleapis.com/maps/api/js?key=value&sensor=false')
-      assert_has_tag('script', :src => "https://maps.googleapis.com/maps/api/js?key=value&sensor=false") { actual_html }
+      assert_html_has_tag(actual_html, 'script', :src => "https://maps.googleapis.com/maps/api/js?key=value&sensor=false")
     end
 
     it 'should display javascript items' do
       time = stop_time_for_test
       actual_html = javascript_include_tag('application', 'base.js', 'http://google.com/lib.js')
-      assert_has_tag('script', :type => "text/javascript", :count => 3) { actual_html }
-      assert_has_tag('script', :src => "/javascripts/application.js?#{time.to_i}") { actual_html }
-      assert_has_tag('script', :src => "/javascripts/base.js?#{time.to_i}") { actual_html }
-      assert_has_tag('script', :src => "http://google.com/lib.js") { actual_html }
+      assert_html_has_tag(actual_html, 'script', :type => "text/javascript", :count => 3)
+      assert_html_has_tag(actual_html, 'script', :src => "/javascripts/application.js?#{time.to_i}")
+      assert_html_has_tag(actual_html, 'script', :src => "/javascripts/base.js?#{time.to_i}")
+      assert_html_has_tag(actual_html, 'script', :src => "http://google.com/lib.js")
       assert_equal actual_html, javascript_include_tag(['application', 'base.js', 'http://google.com/lib.js'])
     end
 
     it 'should not use a timestamp if stamp setting is false' do
       self.class.expects(:asset_stamp).returns(false)
       actual_html = javascript_include_tag('application')
-      assert_has_tag('script', :src => "/javascripts/application.js", :type => "text/javascript") { actual_html }
+      assert_html_has_tag(actual_html, 'script', :src => "/javascripts/application.js", :type => "text/javascript")
     end
   end
 
@@ -371,33 +366,33 @@ describe "AssetTagHelpers" do
     it 'should display favicon' do
       time = stop_time_for_test
       actual_html = favicon_tag('icons/favicon.png')
-      assert_has_tag('link', :rel => 'icon', :type => 'image/png', :href => "/images/icons/favicon.png?#{time.to_i}") { actual_html }
+      assert_html_has_tag(actual_html, 'link', :rel => 'icon', :type => 'image/png', :href => "/images/icons/favicon.png?#{time.to_i}")
     end
 
     it 'should match type with file ext' do
       time = stop_time_for_test
       actual_html = favicon_tag('favicon.ico')
-      assert_has_tag('link', :rel => 'icon', :type => 'image/ico', :href => "/images/favicon.ico?#{time.to_i}") { actual_html }
+      assert_html_has_tag(actual_html, 'link', :rel => 'icon', :type => 'image/ico', :href => "/images/favicon.ico?#{time.to_i}")
     end
 
     it 'should allow option overrides' do
       time = stop_time_for_test
       actual_html = favicon_tag('favicon.png', :type => 'image/ico')
-      assert_has_tag('link', :rel => 'icon', :type => 'image/ico', :href => "/images/favicon.png?#{time.to_i}") { actual_html }
+      assert_html_has_tag(actual_html, 'link', :rel => 'icon', :type => 'image/ico', :href => "/images/favicon.png?#{time.to_i}")
     end
   end
 
   describe 'for #feed_tag method' do
     it 'should generate correctly link tag for rss' do
-      assert_has_tag('link', :type => 'application/rss+xml', :rel => 'alternate', :href => "/blog/post.rss", :title => 'rss') { feed_tag :rss, "/blog/post.rss" }
+      assert_html_has_tag(feed_tag(:rss, "/blog/post.rss"), 'link', :type => 'application/rss+xml', :rel => 'alternate', :href => "/blog/post.rss", :title => 'rss')
     end
 
     it 'should generate correctly link tag for atom' do
-      assert_has_tag('link', :type => 'application/atom+xml', :rel => 'alternate', :href => "/blog/post.atom", :title => 'atom') { feed_tag :atom, "/blog/post.atom" }
+      assert_html_has_tag(feed_tag(:atom, "/blog/post.atom"), 'link', :type => 'application/atom+xml', :rel => 'alternate', :href => "/blog/post.atom", :title => 'atom')
     end
 
     it 'should override options' do
-      assert_has_tag('link', :type => 'my-type', :rel => 'my-rel', :href => "/blog/post.rss", :title => 'my-title') { feed_tag :rss, "/blog/post.rss", :type => "my-type", :rel => "my-rel", :title => "my-title" }
+      assert_html_has_tag(feed_tag(:rss, "/blog/post.rss", :type => "my-type", :rel => "my-rel", :title => "my-title"), 'link', :type => 'my-type', :rel => 'my-rel', :href => "/blog/post.rss", :title => 'my-title')
     end
   end