aboutsummaryrefslogtreecommitdiffstats
path: root/actionwebservice
diff options
context:
space:
mode:
authorLeon Breedt <bitserf@gmail.com>2005-05-08 19:34:54 +0000
committerLeon Breedt <bitserf@gmail.com>2005-05-08 19:34:54 +0000
commit190eaf93078d2fae54b0f88a3325f2965b560fe3 (patch)
tree8dfd5c598735571e0214d89d7943b84f2f636c03 /actionwebservice
parent884fd4792d33032ffa88e08d17a9cf14b733c078 (diff)
downloadrails-190eaf93078d2fae54b0f88a3325f2965b560fe3.tar.gz
rails-190eaf93078d2fae54b0f88a3325f2965b560fe3.tar.bz2
rails-190eaf93078d2fae54b0f88a3325f2965b560fe3.zip
fix that functional testing for :layered SOAP would complain that it
was not XML-RPC. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1295 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionwebservice')
-rw-r--r--actionwebservice/lib/action_web_service/test_invoke.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/actionwebservice/lib/action_web_service/test_invoke.rb b/actionwebservice/lib/action_web_service/test_invoke.rb
index 18b18ef746..02ed9ea586 100644
--- a/actionwebservice/lib/action_web_service/test_invoke.rb
+++ b/actionwebservice/lib/action_web_service/test_invoke.rb
@@ -21,9 +21,6 @@ module Test # :nodoc:
# invoke the specified layered API method on the correct service
def invoke_layered(service_name, method_name, *args)
- if protocol.is_a?(ActionWebService::Protocol::Soap::SoapProtocol)
- raise "SOAP protocol support for :layered dispatching mode is not available"
- end
prepare_request('api', service_name, method_name, *args)
@controller.process(@request, @response)
decode_rpc_response
@@ -66,7 +63,7 @@ module Test # :nodoc:
def public_method_name(service_name, api_method_name)
public_name = service_api(service_name).public_api_method_name(api_method_name)
- if @controller.web_service_dispatching_mode == :layered
+ if @controller.web_service_dispatching_mode == :layered && protocol.is_a?(ActionWebService::Protocol::XmlRpc::XmlRpcProtocol)
'%s.%s' % [service_name.to_s, public_name]
else
public_name