Fix AP test suite after moving stuff to AV
This commit is contained in:
parent
75d38e4364
commit
8c2c95e5d2
@ -10,6 +10,7 @@ module AbstractController
|
||||
autoload :Base
|
||||
autoload :Callbacks
|
||||
autoload :Collector
|
||||
autoload :DoubleRenderError, "abstract_controller/rendering.rb"
|
||||
autoload :Helpers
|
||||
autoload :Logger
|
||||
autoload :Translation
|
||||
|
@ -201,6 +201,7 @@ def self.without_modules(*modules)
|
||||
end
|
||||
|
||||
MODULES = [
|
||||
ActionView::Layouts,
|
||||
AbstractController::Translation,
|
||||
AbstractController::AssetPaths,
|
||||
|
||||
|
@ -29,7 +29,7 @@ class TestBasic < ActiveSupport::TestCase
|
||||
# Test Render mixin
|
||||
# ====
|
||||
class RenderingController < AbstractController::Base
|
||||
include AbstractController::Rendering
|
||||
include ActionView::Rendering
|
||||
|
||||
def _prefixes
|
||||
[]
|
||||
@ -153,7 +153,7 @@ def setup
|
||||
# ====
|
||||
# self._layout is used when defined
|
||||
class WithLayouts < PrefixedViews
|
||||
include AbstractController::Layouts
|
||||
include ActionView::Layouts
|
||||
|
||||
private
|
||||
def self.layout(formats)
|
||||
|
@ -6,7 +6,7 @@ module AbstractController
|
||||
module Testing
|
||||
|
||||
class ControllerWithHelpers < AbstractController::Base
|
||||
include AbstractController::Rendering
|
||||
include ActionView::Rendering
|
||||
include AbstractController::Helpers
|
||||
|
||||
def with_module
|
||||
|
@ -5,8 +5,8 @@ module Layouts
|
||||
|
||||
# Base controller for these tests
|
||||
class Base < AbstractController::Base
|
||||
include AbstractController::Rendering
|
||||
include AbstractController::Layouts
|
||||
include ActionView::Rendering
|
||||
include ActionView::Layouts
|
||||
|
||||
abstract!
|
||||
|
||||
|
@ -4,7 +4,7 @@ module AbstractController
|
||||
module Testing
|
||||
|
||||
class ControllerRenderer < AbstractController::Base
|
||||
include AbstractController::Rendering
|
||||
include ActionView::Rendering
|
||||
|
||||
def _prefixes
|
||||
%w[renderer]
|
||||
|
@ -271,6 +271,7 @@ def assert_header(name, value)
|
||||
module ActionController
|
||||
class Base
|
||||
include ActionController::Testing
|
||||
include ActionView::Layouts
|
||||
# This stub emulates the Railtie including the URL helpers from a Rails application
|
||||
include SharedTestRoutes.url_helpers
|
||||
include SharedTestRoutes.mounted_helpers
|
||||
|
Loading…
Reference in New Issue
Block a user