From: <de...@de...> - 2007-01-10 10:45:57
|
Author: CrawfordCurrie Date: 2007-01-10 04:45:34 -0600 (Wed, 10 Jan 2007) New Revision: 12478 Modified: twiki/branches/MAIN/test/unit/RegisterTests.pm Log: Item3407: removed nospam padding from email address in registration screens by entity-encoding the address so it doesn't get munged by the rendering loop. Also fixed incidental bug that was causing a crash when no login name was specified in the registration screen. Modified: twiki/branches/MAIN/test/unit/RegisterTests.pm =================================================================== --- twiki/branches/MAIN/test/unit/RegisterTests.pm 2007-01-10 10:29:10 UTC (rev 12477) +++ twiki/branches/MAIN/test/unit/RegisterTests.pm 2007-01-10 10:45:34 UTC (rev 12478) @@ -35,6 +35,7 @@ my $testUserWikiName = 'TestUser'; my $testUserLoginName = 'testuser'; my $testUserEmail = 'ka...@gr...'; +my $encodedTestUserEmail; my $guestLoginName = 'guest'; @@ -70,6 +71,8 @@ $SIG{__DIE__} = sub { confess $_[0] }; + $encodedTestUserEmail = TWiki::entityEncode($testUserEmail); + try { $session->{store}->createWeb($session->{user}, $testWeb); $session->{store}->createWeb($session->{user}, $peopleWeb, @@ -336,7 +339,7 @@ my $e = shift; $this->assert_str_equals("attention", $e->{template},$e->stringify()); $this->assert_str_equals("confirm", $e->{def}, $e->stringify()); - $this->assert_matches(qr/$testUserEmail/, $e->stringify()); + $this->assert_matches(qr/$encodedTestUserEmail/, $e->stringify()); } catch TWiki::AccessControlException with { my $e = shift; $this->assert(0, $e->stringify); @@ -427,7 +430,7 @@ TWiki::UI::Register::register_cgi($session); } catch TWiki::OopsException with { my $e = shift; - $this->assert_matches(qr/$testUserEmail/, $e->stringify()); + $this->assert_matches(qr/$encodedTestUserEmail/, $e->stringify()); $this->assert_str_equals("attention", $e->{template}); $this->assert_str_equals("confirm", $e->{def}); } catch TWiki::AccessControlException with { |