aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-15 17:49:11 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-15 17:49:11 -0700
commit5a45446cff0daf4ca747257a8779dcd5d9cae1d7 (patch)
tree23a7ff81593e1d1060f01f340852fd8477c825c4 /actionpack/test
parent7e10504bdeab14ea70a942110a1b1ef6d8467ed3 (diff)
downloadrails-5a45446cff0daf4ca747257a8779dcd5d9cae1d7.tar.gz
rails-5a45446cff0daf4ca747257a8779dcd5d9cae1d7.tar.bz2
rails-5a45446cff0daf4ca747257a8779dcd5d9cae1d7.zip
Ported Rescuable to new base
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/abstract_unit2.rb12
1 files changed, 10 insertions, 2 deletions
diff --git a/actionpack/test/abstract_unit2.rb b/actionpack/test/abstract_unit2.rb
index 932f594ad2..519e6bea36 100644
--- a/actionpack/test/abstract_unit2.rb
+++ b/actionpack/test/abstract_unit2.rb
@@ -11,11 +11,19 @@ require 'action_controller/new_base'
require 'fixture_template'
require 'action_controller/testing/process2'
require 'action_view/test_case'
+require 'action_controller/testing/integration'
+require 'active_support/dependencies'
+
+ActiveSupport::Dependencies.hook!
FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
module ActionController
-
+ Base.session = {
+ :key => '_testing_session',
+ :secret => '8273f16463985e2b3747dc25e30f2528'
+}
+
class ActionControllerError < StandardError #:nodoc:
end
@@ -126,6 +134,6 @@ module ActionController
"Expected no partials to be rendered"
end
end
- end
+ end
end
end