From a22ed3d8c26e95db5d193c7e9a647bb23b622b74 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 6 Mar 2005 12:27:06 +0000
Subject: Use example.com domains to make rails RFC2606 compliant #708

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@840 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/test/template/asset_tag_helper_test.rb |  8 ++---
 actionpack/test/template/url_helper_test.rb       | 38 +++++++++++------------
 2 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index a8d01f18f5..d93d0967e0 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -9,16 +9,16 @@ class AssetTagHelperTest < Test::Unit::TestCase
   def setup
     @controller = Class.new do
       def url_for(options, *parameters_for_method_reference)
-        "http://www.world.com"
+        "http://www.example.com"
       end
     end
     @controller = @controller.new
   end
 
   AutoDiscoveryToTag = {
-    %(auto_discovery_link_tag) => %(<link href="http://www.world.com" rel="alternate" title="RSS" type="application/rss+xml" />),
-    %(auto_discovery_link_tag(:atom)) => %(<link href="http://www.world.com" rel="alternate" title="ATOM" type="application/atom+xml" />),
-    %(auto_discovery_link_tag(:rss, :action => "feed")) => %(<link href="http://www.world.com" rel="alternate" title="RSS" type="application/rss+xml" />),
+    %(auto_discovery_link_tag) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
+    %(auto_discovery_link_tag(:atom)) => %(<link href="http://www.example.com" rel="alternate" title="ATOM" type="application/atom+xml" />),
+    %(auto_discovery_link_tag(:rss, :action => "feed")) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
   }
 
   JavascriptIncludeToTag = {
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index a38a259167..98686c5f15 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -11,7 +11,7 @@ class UrlHelperTest < Test::Unit::TestCase
   def setup
     @controller = Class.new do
       def url_for(options, *parameters_for_method_reference)
-        "http://www.world.com"
+        "http://www.example.com"
       end
     end
     @controller = @controller.new
@@ -19,44 +19,44 @@ class UrlHelperTest < Test::Unit::TestCase
 
   # todo: missing test cases
   def test_link_tag_with_straight_url
-    assert_equal "<a href=\"http://www.world.com\">Hello</a>", link_to("Hello", "http://www.world.com")
+    assert_equal "<a href=\"http://www.example.com\">Hello</a>", link_to("Hello", "http://www.example.com")
   end
 
   def test_link_tag_with_javascript_confirm
     assert_equal(
-      "<a href=\"http://www.world.com\" onclick=\"return confirm('Are you sure?');\">Hello</a>",
-      link_to("Hello", "http://www.world.com", :confirm => "Are you sure?")
+      "<a href=\"http://www.example.com\" onclick=\"return confirm('Are you sure?');\">Hello</a>",
+      link_to("Hello", "http://www.example.com", :confirm => "Are you sure?")
     )
     assert_equal(
-      "<a href=\"http://www.world.com\" onclick=\"return confirm('You can\\'t possibly be sure, can you?');\">Hello</a>", 
-      link_to("Hello", "http://www.world.com", :confirm => "You can't possibly be sure, can you?")
+      "<a href=\"http://www.example.com\" onclick=\"return confirm('You can\\'t possibly be sure, can you?');\">Hello</a>", 
+      link_to("Hello", "http://www.example.com", :confirm => "You can't possibly be sure, can you?")
     )
   end
 
   def test_link_image_to
     assert_equal(
-      "<a href=\"http://www.world.com\"><img alt=\"Rss\" border=\"0\" height=\"45\" src=\"/images/rss.png\" width=\"30\" /></a>",
-      link_image_to("rss", "http://www.world.com", "size" => "30x45", "border" => "0")
+      "<a href=\"http://www.example.com\"><img alt=\"Rss\" border=\"0\" height=\"45\" src=\"/images/rss.png\" width=\"30\" /></a>",
+      link_image_to("rss", "http://www.example.com", "size" => "30x45", "border" => "0")
     )
 
     assert_equal(
-      "<a class=\"admin\" href=\"http://www.world.com\"><img alt=\"Feed\" height=\"45\" src=\"/images/rss.gif\" width=\"30\" /></a>",
-      link_image_to("rss.gif", "http://www.world.com", "size" => "30x45", "alt" => "Feed", "class" => "admin")
+      "<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")
     )
 
-    assert_equal link_image_to("rss", "http://www.world.com", "size" => "30x45"),
-                 link_image_to("rss", "http://www.world.com", :size => "30x45")
-    assert_equal link_image_to("rss.gif", "http://www.world.com", "size" => "30x45", "alt" => "Feed", "class" => "admin"),
-                 link_image_to("rss.gif", "http://www.world.com", :size => "30x45", :alt => "Feed", :class => "admin")
+    assert_equal link_image_to("rss", "http://www.example.com", "size" => "30x45"),
+                 link_image_to("rss", "http://www.example.com", :size => "30x45")
+    assert_equal link_image_to("rss.gif", "http://www.example.com", "size" => "30x45", "alt" => "Feed", "class" => "admin"),
+                 link_image_to("rss.gif", "http://www.example.com", :size => "30x45", :alt => "Feed", :class => "admin")
   end
 
   def test_link_unless_current
-    @request = RequestMock.new("http://www.world.com")
+    @request = RequestMock.new("http://www.example.com")
     assert_equal "Showing", link_to_unless_current("Showing", :action => "show", :controller => "weblog")
-    @request = RequestMock.new("http://www.notworld.com")
-    assert "<a href=\"http://www.world.com\">Listing</a>", link_to_unless_current("Listing", :action => "list", :controller => "weblog")
+    @request = RequestMock.new("http://www.example.org")
+    assert "<a href=\"http://www.example.com\">Listing</a>", link_to_unless_current("Listing", :action => "list", :controller => "weblog")
 
-    @request = RequestMock.new("http://www.world.com")
+    @request = RequestMock.new("http://www.example.com")
     assert_equal "Showing", link_to_unless_current("Showing", :action => "show", :controller => "weblog", :id => 1)
   end
 
@@ -72,6 +72,6 @@ class UrlHelperTest < Test::Unit::TestCase
   end
 
   def test_link_with_nil_html_options
-    assert_equal "<a href=\"http://www.world.com\">Hello</a>", link_to("Hello", {:action => 'myaction'}, nil)
+    assert_equal "<a href=\"http://www.example.com\">Hello</a>", link_to("Hello", {:action => 'myaction'}, nil)
   end
 end
-- 
cgit v1.2.3