aboutsummaryrefslogtreecommitdiffstats
path: root/actionwebservice/test
diff options
context:
space:
mode:
authorLeon Breedt <bitserf@gmail.com>2005-07-06 21:50:27 +0000
committerLeon Breedt <bitserf@gmail.com>2005-07-06 21:50:27 +0000
commitd01c44d550998190108ee31647e42393a65b6469 (patch)
tree98f296e2b06c50fbf2ae9ce17750c3f0f74ae453 /actionwebservice/test
parente5b86efea929e7ebe09317d20c6cc33a1042aeec (diff)
downloadrails-d01c44d550998190108ee31647e42393a65b6469.tar.gz
rails-d01c44d550998190108ee31647e42393a65b6469.tar.bz2
rails-d01c44d550998190108ee31647e42393a65b6469.zip
fix bug in unit test causing spurious failures, and make sure the
unit test requires the Rails libraries from *Source Control* first, or we'll get false positives. add ActiveRecord require to abstract_unit.rb. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1742 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionwebservice/test')
-rw-r--r--actionwebservice/test/abstract_dispatcher.rb8
-rw-r--r--actionwebservice/test/abstract_unit.rb4
2 files changed, 8 insertions, 4 deletions
diff --git a/actionwebservice/test/abstract_dispatcher.rb b/actionwebservice/test/abstract_dispatcher.rb
index 12ab08019f..e01d902ae1 100644
--- a/actionwebservice/test/abstract_dispatcher.rb
+++ b/actionwebservice/test/abstract_dispatcher.rb
@@ -155,8 +155,8 @@ module DispatcherTest
web_service_dispatching_mode :direct
wsdl_namespace WsdlNamespace
- before_filter :alwaysfail, :only => [:before_filtered]
- after_filter :alwaysok, :only => [:after_filtered]
+ before_invocation :alwaysfail, :only => [:before_filtered]
+ after_invocation :alwaysok, :only => [:after_filtered]
attr :added
attr :added2
@@ -232,12 +232,12 @@ module DispatcherTest
end
protected
- def alwaysfail
+ def alwaysfail(method_name, params)
@before_filter_called = true
false
end
- def alwaysok
+ def alwaysok(method_name, params, return_value)
@after_filter_called = true
end
end
diff --git a/actionwebservice/test/abstract_unit.rb b/actionwebservice/test/abstract_unit.rb
index cbeda66e90..a57299bea0 100644
--- a/actionwebservice/test/abstract_unit.rb
+++ b/actionwebservice/test/abstract_unit.rb
@@ -1,7 +1,11 @@
ENV["RAILS_ENV"] = "test"
$:.unshift(File.dirname(__FILE__) + '/../lib')
+$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
+$:.unshift(File.dirname(__FILE__) + '/../../actionpack/lib')
+$:.unshift(File.dirname(__FILE__) + '/../../activerecord/lib')
require 'test/unit'
+require 'active_record'
require 'action_web_service'
require 'action_controller'
require 'action_controller/test_process'