From 9b857d3501498092327b2c8119d91aec1d9408a2 Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Fri, 12 Jun 2009 19:47:56 -0500
Subject: [PATCH] Test page_name, not text

Fix from Jason Blevins.
---
 lib/url_generator.rb   | 2 +-
 test/test_helper.rb    | 2 +-
 test/unit/page_test.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/url_generator.rb b/lib/url_generator.rb
index d574f7f4..760070d7 100644
--- a/lib/url_generator.rb
+++ b/lib/url_generator.rb
@@ -87,7 +87,7 @@ class UrlGenerator < AbstractUrlGenerator
   end
 
   def page_link(mode, name, text, web_address, known_page)
-    return %{<span class='wikilink-error'><b>Illegal link (contains a '.'):</b> [[#{text}]]</span>} if text.include?('.')
+    return %{<span class='wikilink-error'><b>Illegal link (target contains a '.'):</b> #{name}</span>} if name.include?('.')
     case mode
     when :export
       if known_page 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 76302762..0f6832e1 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -127,7 +127,7 @@ class StubUrlGenerator < AbstractUrlGenerator
 
   def page_link(mode, name, text, web_address, known_page)
     link = CGI.escape(name)
-    return %{<span class='wikilink-error'><b>Illegal link (contains a '.'):</b> [[#{text}]]</span>} if text.include?('.')
+    return %{<span class='wikilink-error'><b>Illegal link (target contains a '.'):</b> #{name}</span>} if name.include?('.')
     case mode
     when :export
       if known_page then %{<a class="existingWikiWord" href="#{link}.html">#{text}</a>}
diff --git a/test/unit/page_test.rb b/test/unit/page_test.rb
index 3011e21f..395d4466 100644
--- a/test/unit/page_test.rb
+++ b/test/unit/page_test.rb
@@ -161,7 +161,7 @@ class PageTest < ActiveSupport::TestCase
     references = new_page.wiki_references(true)
     assert_equal( "<p>Reference to <a class='existingWikiWord' href='\.\./show/MyPage'>Happy Page</a>" +
       " and to <span class='newWikiWord'>Wanted Page2<a href='../show/WantedPage2'>?</a></span>.pdf " +
-      "and <span class='wikilink-error'><b>Illegal link (contains a &#39;.&#39;):</b> [[foo.pdf]]</span></p>",
+      "and <span class='wikilink-error'><b>Illegal link (target contains a &#39;.&#39;):</b> foo.pdf</span></p>",
          test_renderer(new_page.revisions.last).display_content(true) )
     assert_equal 3, references.size
 #   now it works.