From 5a4846a0d385b54e8ba1c974bf8c4de29fb49ea5 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 9 Mar 2005 13:53:47 +0000
Subject: Added TagHelper#image_tag and deprecated UrlHelper#link_image_to
 (recommended approach is to combine image_tag and link_to instead)

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@879 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/test/template/tag_helper_test.rb | 17 ++++-------------
 actionpack/test/template/url_helper_test.rb | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 14 deletions(-)

(limited to 'actionpack/test/template')

diff --git a/actionpack/test/template/tag_helper_test.rb b/actionpack/test/template/tag_helper_test.rb
index 9d8d2644e8..cf3dabd522 100644
--- a/actionpack/test/template/tag_helper_test.rb
+++ b/actionpack/test/template/tag_helper_test.rb
@@ -1,4 +1,5 @@
-require 'test/unit'
+require File.dirname(__FILE__) + '/../abstract_unit'
+
 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/tag_helper'
 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/url_helper'
 
@@ -17,17 +18,7 @@ class TagHelperTest < Test::Unit::TestCase
                  content_tag("a", "Create", :href => "create")
   end
 
-  def test_mail_to_with_javascript
-    assert_equal "<script type=\"text/javascript\" language=\"javascript\">eval(unescape('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%4d%79%20%65%6d%61%69%6c%3c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", "My email", :encode => "javascript")
-  end
-
-  def test_mail_to_with_hex
-    assert_equal "<a href=\"mailto:%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d\">My email</a>", mail_to("me@domain.com", "My email", :encode => "hex")
+  def test_image_tag
+    assert_equal %(<img alt="Gold" height="70" src="/images/gold.png" width="45" />), image_tag("gold", :size => "45x70")
   end
-
-  def test_mail_to
-    assert_equal "<a href=\"mailto:me@domain.com\">My email</a>", mail_to("me@domain.com", "My email")
-  end
-
-  # FIXME: Test form tag
 end
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index 19c8e825d6..828af7bb14 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -1,4 +1,5 @@
-require 'test/unit'
+require File.dirname(__FILE__) + '/../abstract_unit'
+
 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/url_helper'
 require File.dirname(__FILE__) + '/../../lib/action_view/helpers/tag_helper'
 
@@ -39,6 +40,11 @@ class UrlHelperTest < Test::Unit::TestCase
       link_image_to("rss", "http://www.example.com", "size" => "30x45", "border" => "0")
     )
 
+    assert_equal(
+      "<a href=\"http://www.example.com\"><img alt=\"Rss\" border=\"0\" height=\"45\" src=\"/images/rss.png\" width=\"30\" /></a>",
+      link_to(image_tag("rss", :size => "30x45", :border => 0), "http://www.example.com")
+    )
+
     assert_equal(
       "<a class=\"admin\" href=\"http://www.example.com\"><img alt=\"Feed\" height=\"45\" src=\"/images/rss.gif\" width=\"30\" /></a>",
       link_image_to("rss.gif", "http://www.example.com", "size" => "30x45", "alt" => "Feed", "class" => "admin")
@@ -93,6 +99,15 @@ class UrlHelperTest < Test::Unit::TestCase
                  mail_to("david@loudthinking.com", "David Heinemeier Hansson", :class => "admin")
   end
 
+
+  def test_mail_to_with_javascript
+    assert_equal "<script type=\"text/javascript\" language=\"javascript\">eval(unescape('%64%6f%63%75%6d%65%6e%74%2e%77%72%69%74%65%28%27%3c%61%20%68%72%65%66%3d%22%6d%61%69%6c%74%6f%3a%6d%65%40%64%6f%6d%61%69%6e%2e%63%6f%6d%22%3e%4d%79%20%65%6d%61%69%6c%3c%2f%61%3e%27%29%3b'))</script>", mail_to("me@domain.com", "My email", :encode => "javascript")
+  end
+
+  def test_mail_to_with_hex
+    assert_equal "<a href=\"mailto:%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d\">My email</a>", mail_to("me@domain.com", "My email", :encode => "hex")
+  end
+
   def test_link_with_nil_html_options
     assert_equal "<a href=\"http://www.example.com\">Hello</a>", link_to("Hello", {:action => 'myaction'}, nil)
   end
-- 
cgit v1.2.3