request->body and request->param should be the same in tests

This commit is contained in:
Graham Knop 2008-08-07 22:55:35 +00:00
parent 3d62fa8e69
commit f082e2d14e
6 changed files with 7 additions and 23 deletions

View file

@ -283,6 +283,7 @@ my $origRequest = $session->{_request};
my $newRequest = Test::MockObject->new(); my $newRequest = Test::MockObject->new();
my $func; my $func;
$newRequest->set_bound('body', \$func); $newRequest->set_bound('body', \$func);
$newRequest->set_bound('param', \$func);
$session->{_request} = $newRequest; $session->{_request} = $newRequest;
$func = 'add'; $func = 'add';
is($importNode->addEditLabel, $i18n->get('add').' '.$importNode->getName, 'addEditLabel, use add mode'); is($importNode->addEditLabel, $i18n->get('add').' '.$importNode->getName, 'addEditLabel, use add mode');

View file

@ -97,6 +97,7 @@ sub hack_session_request {
return $id return $id
}, },
); );
$request->mock('param', sub { shift->body(@_) });
$session->{_request} = $request; $session->{_request} = $request;
} }

View file

@ -99,6 +99,7 @@ sub auto_check {
} }
} }
); );
$request->mock('param', sub {shift->body(@_)});
$session->{_request} = $request; $session->{_request} = $request;

View file

@ -80,6 +80,7 @@ $request->mock('body',
return 0; return 0;
} }
); );
$request->mock('param', sub {shift->body(@_)});
$session->{_request} = $request; $session->{_request} = $request;

View file

@ -26,6 +26,7 @@ sub auto_check {
} }
} }
); );
$request->mock('param', sub {shift->body(@_)});
$session->{_request} = $request; $session->{_request} = $request;

View file

@ -310,27 +310,7 @@ Compatibility method. Works exactly like the body method.
sub param { sub param {
my $self = shift; my $self = shift;
my $value = shift; $self->body(@_);
return keys %{ $self->{param} } unless defined $value;
if ($self->{param}->{$value}) {
if (wantarray && ref $self->{param}->{$value} eq "ARRAY") {
return @{$self->{param}->{$value}};
}
elsif (ref $self->{param}->{$value} eq "ARRAY") {
return $self->{param}->{$value}->[0];
}
else {
return $self->{param}->{$value};
}
}
else {
if (wantarray) {
return ();
}
else {
return undef;
}
}
} }
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -344,8 +324,7 @@ form variables and values.
sub setup_param { sub setup_param {
my $self = shift; my $self = shift;
my $value = shift; $self->setup_body(@_);
$self->{param} = $value;
} }
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------