aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Breedt <bitserf@gmail.com>2005-08-14 17:27:28 +0000
committerLeon Breedt <bitserf@gmail.com>2005-08-14 17:27:28 +0000
commit056838d2fc959ab71f598dee8b8b0691608f8a72 (patch)
treedadd955f7b3a77ade0b28612294ed4f1f6a125be
parent639d03bbb76f0252ec19418ca7376a872840b8d4 (diff)
downloadrails-056838d2fc959ab71f598dee8b8b0691608f8a72.tar.gz
rails-056838d2fc959ab71f598dee8b8b0691608f8a72.tar.bz2
rails-056838d2fc959ab71f598dee8b8b0691608f8a72.zip
Allow multiple invocations in the same WS test #1720
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2013 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionwebservice/CHANGELOG2
-rw-r--r--actionwebservice/lib/action_web_service/test_invoke.rb1
2 files changed, 3 insertions, 0 deletions
diff --git a/actionwebservice/CHANGELOG b/actionwebservice/CHANGELOG
index e21a9e73ba..b03bfeb508 100644
--- a/actionwebservice/CHANGELOG
+++ b/actionwebservice/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Allow multiple invocations in the same test method #1720 [dkhawk]
+
* Added ActionWebService::API::Base.soap_client and ActionWebService::API::Base.xmlrpc_client helper methods to create the internal clients for an API, useful for testing from ./script/console
* ActionWebService now always returns UTF-8 responses.
diff --git a/actionwebservice/lib/action_web_service/test_invoke.rb b/actionwebservice/lib/action_web_service/test_invoke.rb
index cd9cb115ff..dd608e2d78 100644
--- a/actionwebservice/lib/action_web_service/test_invoke.rb
+++ b/actionwebservice/lib/action_web_service/test_invoke.rb
@@ -29,6 +29,7 @@ module Test # :nodoc:
# ---------------------- internal ---------------------------
def prepare_request(action, service_name, api_method_name, *args)
+ @request.recycle!
@request.request_parameters['action'] = action
@request.env['REQUEST_METHOD'] = 'POST'
@request.env['HTTP_CONTENT_TYPE'] = 'text/xml'