@@ -12,7 +12,7 @@ module ActionWebService # :nodoc: def encode_action_pack_request(service_name, public_method_name, raw_body, options={}) klass = options[:request_class] || SimpleActionPackRequest - request = klass.new + request = klass.new({}) request.request_parameters['action'] = service_name.to_s request.env['RAW_POST_DATA'] = raw_body request.env['REQUEST_METHOD'] = 'POST' @@ -72,8 +72,8 @@ module ActionWebService # :nodoc: end class SimpleActionPackRequest < ActionController::Request # :nodoc: - def initialize - @env = {} + def initialize(env = {}) + @env = env @qparams = {} @rparams = {} @cookies = {} lib/action_web_service/protocol/abstract.rb @@ -69,7 +69,7 @@ module ActionWebService post_params = params['method_params'] ? params['method_params'].dup : nil params = [] @scaffold_method.expects.each_with_index do |spec, i| - params << post_params[i.to_s] + params << post_params[i.to_s] end if @scaffold_method.expects params = @scaffold_method.cast_expects(params) method_name = public_method_name(@scaffold_service.name, @scaffold_method.public_name) @@ -106,9 +106,9 @@ module ActionWebService def render_invocation_scaffold(action) customized_template = "\#{self.class.controller_path}/#{action_name}/\#{action}" default_template = scaffold_path(action) - if template_exists?(customized_template) + begin content = @template.render(:file => customized_template) - else + rescue ActionView::MissingTemplate content = @template.render(:file => default_template) end @template.instance_variable_set("@content_for_layout", content) @@ -125,7 +125,7 @@ module ActionWebService def reset_invocation_response erase_render_results - response.headers = ::ActionController::AbstractResponse::DEFAULT_HEADERS.merge("cookie" => []) + response.instance_variable_set :@header, Rack::Utils::HeaderHash.new(::ActionController::Response::DEFAULT_HEADERS.merge("cookie" => [])) end def public_method_name(service_name, method_name) lib/action_web_service/scaffolding.rb @@ -358,7 +358,7 @@ module DispatcherCommonTests response = ActionController::TestResponse.new controller.process(request, response) # puts response.body - assert(response.headers['Status'] =~ /^500/) + assert(response.status =~ /^500/) end send_garbage_request.call controller.class.web_service_exception_reporting = false @@ -538,7 +538,8 @@ module DispatcherCommonTests def http_method_allowed?(method) method = method.to_s.upcase - test_request = ActionController::TestRequest.new({ 'action' => 'api' }) + test_request = ActionController::TestRequest.new + test_request.action = 'api' test_response = ActionController::TestResponse.new test_request.env['REQUEST_METHOD'] = method result = @direct_controller.process(test_request, test_response) test/abstract_dispatcher.rb @@ -4,7 +4,9 @@ require 'rubygems' require 'test/unit' require 'action_web_service' require 'action_controller' -require 'action_controller/test_process' +require 'action_controller/test_case' +require 'action_view' +require 'action_view/test_case' # Show backtraces for deprecated behavior for quicker cleanup. ActiveSupport::Deprecation.debug = true @@ -14,6 +16,7 @@ ActiveRecord::Base.logger = ActionController::Base.logger = Logger.new("debug.lo begin require 'activerecord' + require "active_record/test_case" require "active_record/fixtures" unless Object.const_defined?(:Fixtures) rescue LoadError => e fail "\nFailed to load activerecord: #{e}" @@ -30,4 +33,7 @@ ActiveRecord::Base.configurations = { ActiveRecord::Base.establish_connection 'mysql' -Test::Unit::TestCase.fixture_path = "#{File.dirname(__FILE__)}/fixtures/" +class ActiveSupport::TestCase + include ActiveRecord::TestFixtures + self.fixture_path = "#{File.dirname(__FILE__)}/fixtures/" +end test/abstract_unit.rb @@ -12,7 +12,7 @@ module APITest end end -class TC_API < Test::Unit::TestCase +class TC_API < ActiveSupport::TestCase API = APITest::API def test_api_method_declaration test/api_test.rb @@ -34,7 +34,7 @@ module BaseTest end end -class TC_Base < Test::Unit::TestCase +class TC_Base < ActiveSupport::TestCase def test_options assert(BaseTest::PristineService.web_service_api.inflect_names == false) assert(BaseTest::Service.web_service_api.inflect_names == true) test/base_test.rb @@ -48,7 +48,7 @@ module ClientSoapTest end end -class TC_ClientSoap < Test::Unit::TestCase +class TC_ClientSoap < ActiveSupport::TestCase include ClientTest include ClientSoapTest test/client_soap_test.rb @@ -42,7 +42,7 @@ module ClientXmlRpcTest end end -class TC_ClientXmlRpc < Test::Unit::TestCase +class TC_ClientXmlRpc < ActiveSupport::TestCase include ClientTest include ClientXmlRpcTest test/client_xmlrpc_test.rb @@ -129,7 +129,8 @@ class TC_DispatcherActionControllerSoap < Test::Unit::TestCase end def ensure_valid_wsdl_action(controller) - test_request = ActionController::TestRequest.new({ 'action' => 'wsdl' }) + test_request = ActionController::TestRequest.new + test_request.action = 'wsdl' test_response = ActionController::TestResponse.new wsdl = controller.process(test_request, test_response).body ensure_valid_wsdl(controller, wsdl, DispatcherTest::WsdlNamespace) test/dispatcher_action_controller_soap_test.rb @@ -64,12 +64,12 @@ class ScaffoldedController < ActionController::Base end end -class ScaffoldedControllerTest < Test::Unit::TestCase - def setup - @controller = ScaffoldedController.new - @request = ActionController::TestRequest.new - @response = ActionController::TestResponse.new - end +class ScaffoldedControllerTest < ActionController::TestCase + # def setup + # @controller = ScaffoldedController.new + # @request = ActionController::TestRequest.new + # @response = ActionController::TestResponse.new + # end def test_scaffold_invoke get :scaffold_invoke test/scaffolded_controller_test.rb @@ -49,7 +49,7 @@ class TestInvokeLayeredController < TestController web_service(:two) { @service_two ||= TestInvokeService.new } end -class TestInvokeTest < Test::Unit::TestCase +class TestInvokeTest < ActiveSupport::TestCase def setup @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new test/test_invoke_test.rb de158a1cdeb5b88f8beaa72fab21e934aa9a3e35 Kent Sibilev ksibilev@gmail.com http://github.com/datanoise/actionwebservice/commit/9d30efab0f5066f786e00306f909c79c87abb930 9d30efab0f5066f786e00306f909c79c87abb930 2009-03-31T08:17:58-07:00 2009-03-31T08:17:58-07:00 applied jkraemer's patch to fix Rails 2.3.2 compatibility 373dee6b4944a477ee56cbd4bae54142dd5b8bfa Kent Sibilev ksibilev@gmail.com