kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix AP test suite after moving stuff to AV

Browse source
This commit is contained in:
Łukasz Strzałkowski 2013-06-28 16:46:10 +02:00
parent 75d38e4364
commit 8c2c95e5d2
7 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
actionpack/lib/abstract_controller.rb
View file

@ -10,6 +10,7 @@ module AbstractController
autoload :Base autoload :Base
autoload :Callbacks autoload :Callbacks
autoload :Collector autoload :Collector
autoload :DoubleRenderError, "abstract_controller/rendering.rb"
autoload :Helpers autoload :Helpers
autoload :Logger autoload :Logger
autoload :Translation autoload :Translation

1
actionpack/lib/action_controller/base.rb
View file

@ -201,6 +201,7 @@ module ActionController
end end
MODULES = [ MODULES = [
ActionView::Layouts,
AbstractController::Translation, AbstractController::Translation,
AbstractController::AssetPaths, AbstractController::AssetPaths,

4
actionpack/test/abstract/abstract_controller_test.rb
View file

@ -29,7 +29,7 @@ module AbstractController
# Test Render mixin # Test Render mixin
# ==== # ====
class RenderingController < AbstractController::Base class RenderingController < AbstractController::Base
include AbstractController::Rendering include ActionView::Rendering
def _prefixes def _prefixes
[] []
@ -153,7 +153,7 @@ module AbstractController
# ==== # ====
# self._layout is used when defined # self._layout is used when defined
class WithLayouts < PrefixedViews class WithLayouts < PrefixedViews
include AbstractController::Layouts include ActionView::Layouts
private private
def self.layout(formats) def self.layout(formats)

2
actionpack/test/abstract/helper_test.rb
View file

@ -6,7 +6,7 @@ module AbstractController
module Testing module Testing
class ControllerWithHelpers < AbstractController::Base class ControllerWithHelpers < AbstractController::Base
include AbstractController::Rendering include ActionView::Rendering
include AbstractController::Helpers include AbstractController::Helpers
def with_module def with_module

4
actionpack/test/abstract/layouts_test.rb
View file

@ -5,8 +5,8 @@ module AbstractControllerTests
# Base controller for these tests # Base controller for these tests
class Base < AbstractController::Base class Base < AbstractController::Base
include AbstractController::Rendering include ActionView::Rendering
include AbstractController::Layouts include ActionView::Layouts
abstract! abstract!

2
actionpack/test/abstract/render_test.rb
View file

@ -4,7 +4,7 @@ module AbstractController
module Testing module Testing
class ControllerRenderer < AbstractController::Base class ControllerRenderer < AbstractController::Base
include AbstractController::Rendering include ActionView::Rendering
def _prefixes def _prefixes
%w[renderer] %w[renderer]

1
actionpack/test/abstract_unit.rb
View file

@ -271,6 +271,7 @@ end
module ActionController module ActionController
class Base class Base
include ActionController::Testing include ActionController::Testing
include ActionView::Layouts
# This stub emulates the Railtie including the URL helpers from a Rails application # This stub emulates the Railtie including the URL helpers from a Rails application
include SharedTestRoutes.url_helpers include SharedTestRoutes.url_helpers
include SharedTestRoutes.mounted_helpers include SharedTestRoutes.mounted_helpers