Changeset 1056

Timestamp:

06/10/07 15:47:11 (18 months ago)

Author:

ilmari

Message:

Check for definedness of redirect parameter before defaulting to 1 (closes #104).

Location:

trunk

Files:

• Changes (modified) (1 diff)
• lib/OpenGuides.pm (modified) (1 diff)
• t/51_display_node.t (modified) (2 diffs)

trunk/Changes

@@ -14 +14 @@
         Only display the google maps preference if node maps are enabled
           (#192).
+        Respect redirect=0 (#104).
 
 0.60    13 May 2007

trunk/lib/OpenGuides.pm

@@ -176 +176 @@
     my $config = $self->config;
     my $oldid = $args{oldid} || '';
-    my $do_redirect = $args{redirect} || 1;
+    my $do_redirect = defined($args{redirect}) ? $args{redirect} : 1;
 
     my %tt_vars;

trunk/t/51_display_node.t

@@ -13 +13 @@
 }
 
-plan tests => 7;
+plan tests => 9;
 
 Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
@@ -48 +48 @@
 my %tt_vars = $guide->display_node( return_tt_vars => 1 );
 ok( defined $tt_vars{recent_changes}, "...and recent_changes is set for the home node even if we have changed its name" );
+
+$wiki->write_node( 'Redirect Test', '#REDIRECT Test Page', undef );
+
+$output = $guide->display_node( id => 'Redirect Test', return_output => 1 );
+
+like( $output, qr{^\QLocation: http://example.com/wiki.cgi?id=Test_Page;oldid=Redirect_Test}ms,
+      '#REDIRECT redirects correctly' );
+
+$output = $guide->display_node( id => 'Redirect Test', return_output => 1, redirect => 0 );
+
+unlike( $output, qr{^\QLocation: }ms, '...but not with redirect=0' );