2 files changed, 21 insertions, 1 deletions
diff --git a/actionwebservice/test/abstract_dispatcher.rb b/actionwebservice/test/abstract_dispatcher.rb
index da07d2cf8c..3657f8a5ee 100644
--- a/actionwebservice/test/abstract_dispatcher.rb
+++ b/actionwebservice/test/abstract_dispatcher.rb
@@ -40,6 +40,7 @@ module DispatcherTest
 
   class DirectAPI < ActionWebService::API::Base
     api_method :add, :expects => [{:a=>:int}, {:b=>:int}], :returns => [:int]
+    api_method :add2, :expects => [{:a=>:int}, {:b=>:int}], :returns => [:int]
     api_method :before_filtered
     api_method :after_filtered, :returns => [[:int]]
     api_method :struct_return, :returns => [[Node]]
@@ -141,6 +142,7 @@ module DispatcherTest
     after_filter :alwaysok, :only => [:after_filtered]
 
     attr :added
+    attr :added2
     attr :before_filter_called
     attr :before_filter_target_called
     attr :after_filter_called
@@ -159,6 +161,10 @@ module DispatcherTest
       @added = @params['a'] + @params['b']
     end
 
+    def add2(a, b)
+      @added2 = a + b
+    end
+
     def before_filtered
       @before_filter_target_called = true
     end
@@ -212,6 +218,8 @@ module DispatcherCommonTests
   def test_direct_dispatching
     assert_equal(70, do_method_call(@direct_controller, 'Add', 20, 50))
     assert_equal(70, @direct_controller.added)
+    assert_equal(50, do_method_call(@direct_controller, 'Add2', 25, 25))
+    assert_equal(50, @direct_controller.added2)
     assert(@direct_controller.void_called == false)
     case @encoder
     when WS::Encoding::SoapRpcEncoding
diff --git a/actionwebservice/test/dispatcher_action_controller_soap_test.rb b/actionwebservice/test/dispatcher_action_controller_soap_test.rb
index dd945972d6..400ab40dd6 100644
--- a/actionwebservice/test/dispatcher_action_controller_soap_test.rb
+++ b/actionwebservice/test/dispatcher_action_controller_soap_test.rb
@@ -2,6 +2,18 @@ $:.unshift(File.dirname(__FILE__) + '/apis')
 require File.dirname(__FILE__) + '/abstract_dispatcher'
 require 'wsdl/parser'
 
+class ActionController::Base
+  class << self
+    alias :inherited_without_name_error :inherited
+    def inherited(child)
+      begin
+        inherited_without_name_error(child)
+      rescue NameError => e
+      end
+    end
+  end
+end
+
 class AutoLoadController < ActionController::Base; end
 class FailingAutoLoadController < ActionController::Base; end
 class BrokenAutoLoadController < ActionController::Base; end
@@ -39,7 +51,7 @@ class TC_DispatcherActionControllerSoap < Test::Unit::TestCase
     assert(!AutoLoadController.web_service_api.nil?)
     assert(AutoLoadController.web_service_api.has_public_api_method?('Void'))
     assert(FailingAutoLoadController.web_service_api.nil?)
-    assert_raises(LoadError, NameError) do
+    assert_raises(MissingSourceFile) do
       FailingAutoLoadController.require_web_service_api :blah
     end
     assert_raises(ArgumentError) do