[prev] [thread] [next] [lurker] [Date index for 2003/11/29]
Author: gabor
Date: 2003-11-29 00:53:13 +0200 (Sat, 29 Nov 2003)
New Revision: 87
Modified:
lib/YAPC/Organizer.pm
lib/YAPC/Person.pm
t/03-web-adduser.t
Log:
change error message
Modified: lib/YAPC/Organizer.pm
===================================================================
--- lib/YAPC/Organizer.pm 2003-11-28 11:28:21 UTC (rev 86)
+++ lib/YAPC/Organizer.pm 2003-11-28 22:53:13 UTC (rev 87)
@@ -464,12 +464,10 @@
}
catch YAPC::Error with {
my $er = shift;
- #$t->param(MESSAGE => 'There was an error in the provided data.');
$t->param(MESSAGE => $er);
}
catch Error with {
- $t->param(MESSAGE => 'There was an error in the provided data.');
- #$t->param(MESSAGE => 'Registration failed.');
+ $t->param(MESSAGE => 'Registration failed.');
} or return $t->output; # on error
Modified: lib/YAPC/Person.pm
===================================================================
--- lib/YAPC/Person.pm 2003-11-28 11:28:21 UTC (rev 86)
+++ lib/YAPC/Person.pm 2003-11-28 22:53:13 UTC (rev 87)
@@ -12,9 +12,6 @@
sub new {
my $self = shift;
my %arg = @_;
-# delete $arg{run}; # was added for CGI::Application
-# delete $arg{submit}; # was added for CGI::Application
-# delete $arg{submitbtn}; # was added for CGI::Application
croak("acked should not be defined\n") if defined $arg{acked};
croak("authcode should not be defined\n") if defined $arg{authcode};
@@ -34,7 +31,6 @@
}
if ($arg{password} and $arg{password2} and
$arg{password} eq $arg{password2}) {
-# delete $arg{password2};
my %passed_args;
@passed_args{@valid_args}= @arg{@valid_args};
__PACKAGE__->create(\%passed_args); # could be $self-> also
Modified: t/03-web-adduser.t
===================================================================
--- t/03-web-adduser.t 2003-11-28 11:28:21 UTC (rev 86)
+++ t/03-web-adduser.t 2003-11-28 22:53:13 UTC (rev 87)
@@ -68,7 +68,7 @@
my $webapp = YAPC::Organizer->new;
$webapp->query($q);
my $result = $webapp->run();
- unlike($result, qr/There was an error in the provided data./, 'no error message');
+ unlike($result, qr/Registration failed./, 'no error message');
like($result, qr@<h2>Registration Form</h2>@, 'no error message');
}
@@ -124,7 +124,7 @@
my $webapp = YAPC::Organizer->new;
$webapp->query($q);
my $result = $webapp->run();
- like($result, qr/There was an error in the provided data/, 'User registered');
+ like($result, qr/Registration failed./, 'registration failed');
}
{
local $ENV{REQUEST_URI} = '/registration.html';
@@ -137,7 +137,7 @@
my $webapp = YAPC::Organizer->new;
$webapp->query($q);
my $result = $webapp->run();
- like($result, qr/There was an error in the provided data/, 'User registered');
+ like($result, qr/>Registration failed./, 'User failed to registere');
}
{
local $ENV{REQUEST_URI} = '/registration.html';
@@ -150,7 +150,7 @@
my $webapp = YAPC::Organizer->new;
$webapp->query($q);
my $result = $webapp->run();
- like($result, qr/There was an error in the provided data/, 'User registered');
+ like($result, qr/Registration failed./, 'User faled because of bad authcode');
}
Generated at 02:10 on 29 Nov 2003 by mariachi 0.51