applied jkraemer's patch to fix Rails 2.3.2 compatibility

Author: Kent Sibilev

lib/action_web_service/protocol/abstract.rb

@@ -12,7 +12,7 @@ def decode_action_pack_request(action_pack_request)
 
       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 @@ def initialize(body, content_type, return_value)
     end
 
     class SimpleActionPackRequest < ActionController::Request # :nodoc:
-      def initialize
-        @env = {}
+      def initialize(env = {})
+        @env = env
         @qparams = {}
         @rparams = {}
         @cookies = {}

lib/action_web_service/scaffolding.rb

@@ -69,7 +69,7 @@ def #{action_name}_submit
                 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 @@ def setup_invocation_assigns
             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 @@ def scaffold_path(template_name)
 
             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)

test/abstract_dispatcher.rb

@@ -358,7 +358,7 @@ def test_garbage_request
         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 @@ def do_method_call(container, public_method_name, *params)
 
     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_unit.rb

@@ -4,7 +4,9 @@
 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 @@
 
 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.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/api_test.rb

@@ -12,7 +12,7 @@ class API < ActionWebService::API::Base
   end
 end
 
-class TC_API < Test::Unit::TestCase
+class TC_API < ActiveSupport::TestCase
   API = APITest::API
 
   def test_api_method_declaration

test/base_test.rb

@@ -34,7 +34,7 @@ def under_score
   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/client_soap_test.rb

@@ -48,7 +48,7 @@ def server_port
   end
 end
 
-class TC_ClientSoap < Test::Unit::TestCase
+class TC_ClientSoap < ActiveSupport::TestCase
   include ClientTest
   include ClientSoapTest
 

test/client_xmlrpc_test.rb

@@ -42,7 +42,7 @@ def server_port
   end
 end
 
-class TC_ClientXmlRpc < Test::Unit::TestCase
+class TC_ClientXmlRpc < ActiveSupport::TestCase
   include ClientTest
   include ClientXmlRpcTest
 

test/dispatcher_action_controller_soap_test.rb

@@ -129,7 +129,8 @@ def ensure_valid_wsdl(controller, wsdl, expected_namespace)
     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/scaffolded_controller_test.rb

@@ -64,12 +64,12 @@ def base64_upcase(data)
   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/test_invoke_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