[Http-webtest-commits] CVS: HTTP-WebTest/lib/HTTP/WebTest/Plugin SetRequest.pm,1.11,1.12 Click.pm,1.11,1.12

[Ilya M. <m_...@us...>]

Update of /cvsroot/http-webtest/HTTP-WebTest/lib/HTTP/WebTest/Plugin
In directory usw-pr-cvs1:/tmp/cvs-serv18977/lib/HTTP/WebTest/Plugin

Modified Files:
	SetRequest.pm Click.pm 
Log Message:
Fixes required to make plugins work with HTTP::WebTest::Request


Index: SetRequest.pm
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/lib/HTTP/WebTest/Plugin/SetRequest.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SetRequest.pm	21 Jun 2002 06:48:16 -0000	1.11
--- SetRequest.pm	24 Jul 2002 21:16:33 -0000	1.12
***************
*** 166,182 ****
      # set request params
      if(defined $params) {
- 	# We use a temporary URI object to format
- 	# the application/x-www-form-urlencoded content.
- 	my $url = URI->new('http:');
  	my @params = ref($params) eq 'ARRAY' ? @$params : %$params;
! 	$url->query_form(@params);
! 	my $query = $url->query;
! 
! 	if($request->method eq 'GET') {
! 	    $request->uri->query($query);
! 	} elsif($request->method eq 'POST') {
! 	    $request->content($query);
! 	    $request->header('Content-Length' => length $query);
! 	}
      }
  
--- 166,171 ----
      # set request params
      if(defined $params) {
  	my @params = ref($params) eq 'ARRAY' ? @$params : %$params;
! 	$request->params(\@params);
      }
  

Index: Click.pm
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/lib/HTTP/WebTest/Plugin/Click.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Click.pm	21 Jun 2002 06:48:16 -0000	1.11
--- Click.pm	24 Jul 2002 21:16:33 -0000	1.12
***************
*** 95,99 ****
  				    pattern  => $click_link);
  
! 	$self->new_request_uri(request => $request, uri => $link)
  	    if defined $link;
      } elsif(defined $click_button) {
--- 95,99 ----
  				    pattern  => $click_link);
  
! 	$request->base_uri($link)
  	    if defined $link;
      } elsif(defined $click_button) {
***************
*** 102,129 ****
  				      pattern  => $click_button);
  
! 	$self->new_request_uri(request => $request, uri => $action)
  	    if defined $action;
-     }
- }
- 
- # sets new request URI preserving query parameters if necessary
- sub new_request_uri {
-     my $self = shift;
-     my %param = @_;
- 
-     my $request = $param{request};
-     my $uri     = $param{uri};
- 
-     my $old_query = undef;
-     if($request->method eq 'GET') {
- 	$old_query = $request->uri->query;
-     }
-     # set request uri
-     $request->uri($uri);
-     # restore query parameters
-     if(defined $old_query) {
- 	my $new_query = $request->uri->query;
- 	$new_query = defined $new_query ? "$new_query&$old_query" : $old_query;
- 	$request->uri->query($new_query);
      }
  }
--- 102,107 ----
  				      pattern  => $click_button);
  
! 	$request->base_uri($action)
  	    if defined $action;
      }
  }