Changeset 1098 for trunk/t

Timestamp:

06/24/07 03:10:37 (19 months ago)

Author:

kake

Message:

Fix changeset [1095] - categories and locales weren't getting linkified even if they _did_ exist.

Files:

• trunk/t/51_display_node.t (modified) (5 diffs)

trunk/t/51_display_node.t

@@ -3 +3 @@
 use OpenGuides::Config;
 use OpenGuides;
+use OpenGuides::Test;
 use Test::More;
 
@@ -13 +14 @@
 }
 
-plan tests => 13;
+plan tests => 15;
 
 Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
@@ -27 +28 @@
                  template_path      => "./templates",
                  home_name          => "Home",
+                 admin_pass         => "password",
                }
 );
@@ -63 +65 @@
 unlike( $output, qr{^\QLocation: }ms, '...but not with redirect=0' );
 
-$wiki->write_node( "Non-existent categories and locales", "foo", undef,
-                                { category => [ "Does not exist" ],
-                                  locale   => [ "Does not exist" ] } );
+# Write a node, then delete one each of its categories and locales.
+OpenGuides::Test->write_data(
+                              guide => $guide,
+                              node => "Non-existent categories and locales",
+                              categories => "Does Not Exist\r\nDoes Exist",
+                              locales => "Does Not Exist\r\nDoes Exist",
+                              return_output => 1,
+                            );
+foreach my $id ( ( "Category Does Not Exist", "Locale Does Not Exist" ) ) {
+    $guide->delete_node(
+                         id => $id,
+                         password => "password",
+                         return_output => 1,
+                       );
+}
 
+# Check the display comes up right for the existent and nonexistent.
 $output = $guide->display_node( id => 'Non-existent categories and locales',
                                 return_output => 1
@@ -72 +87 @@
 
 unlike( $output, qr{\Q<a href="wiki.cgi?Category_Does_Not_Exist"},
-    'Category name not linked if category does not exist' );
+    "category name not linked if category does not exist" );
+like( $output, qr{\Q<a href="wiki.cgi?Category_Does_Exist"},
+    "...but does when it does exist" );
+unlike( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Not_Exist"},
+    "locale name not linked if category does not exist" );
+like( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Exist"},
+    "...but does when it does exist" );
 
-$wiki->write_node( "Category_Does_Not_Exist", "bar", undef, undef );
+# Check it works when the case is different too.
+OpenGuides::Test->write_data(
+                              guide => $guide,
+                              node => "Existent categories and locales",
+                              categories => "does exist",
+                              locales => "does exist",
+                              return_output => 1,
+                            );
 
-$output = $guide->display_node( id => 'Non-existent categories and locales',
+$output = $guide->display_node( id => "Existent categories and locales",
                                 return_output => 1
                               );
-
-like( $output, qr{\Q<a href="wiki.cgi?Category_Does_Not_Exist"},
-    'but does when it does exist' );
-
-unlike( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Not_Exist"},
-    'Locale name not linked if category does not exist' );
-
-$wiki->write_node( "Locale_Does_Not_Exist", "wibble", undef, undef );
-
-$output = $guide->display_node( id => 'Non-existent categories and locales',
-                                return_output => 1
-                              );
-
-like( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Not_Exist"},
-    'but does when it does exist' );
-
-
+like( $output, qr{\Q<a href="wiki.cgi?Category_Does_Exist"},
+    "wrongly-cased categories are linked as they should be" );
+like( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Exist"},
+    "wrongly-cased locales are linked as they should be" );