diff options
Diffstat (limited to 'actionpack/test/abstract_unit.rb')
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index b9293ffb9f..aef3dd6165 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -27,8 +27,6 @@ require 'action_view/base' require 'action_dispatch' require 'active_model' require 'fixture_template' -require 'action_controller/testing/process' -require 'action_controller/testing/integration' require 'action_view/test_case' require 'active_support/dependencies' @@ -54,6 +52,15 @@ ORIGINAL_LOCALES = I18n.available_locales.map {|locale| locale.to_s }.sort FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures') +class ActionController::IntegrationTest < ActiveSupport::TestCase + @@app = ActionDispatch::MiddlewareStack.new { |middleware| + middleware.use "ActionDispatch::ShowExceptions" + middleware.use "ActionDispatch::Callbacks" + middleware.use "ActionDispatch::ParamsParser" + middleware.use "Rack::Head" + }.build(ActionController::Routing::Routes) +end + module ActionView class TestCase setup do @@ -71,10 +78,6 @@ class Rack::TestCase < ActionController::IntegrationTest ActionController::Base.session_options[:secret] = ("*" * 30) end - def app - @app ||= ActionController::Dispatcher.new - end - def self.testing(klass = nil) if klass @testing = "/#{klass.name.underscore}".sub!(/_controller$/, '') @@ -120,12 +123,6 @@ class ::ApplicationController < ActionController::Base end module ActionController - Base.session = { - :key => '_testing_session', - :secret => '8273f16463985e2b3747dc25e30f2528' - } - Base.session_store = nil - class << Routing def possible_controllers @@possible_controllers ||= [] |