mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Change app to main_app in mounted_helpers
This commit is contained in:
parent
18aee33335
commit
6258f7c972
5 changed files with 8 additions and 8 deletions
|
@ -262,7 +262,7 @@ module ActionDispatch
|
|||
module MountedHelpers
|
||||
end
|
||||
|
||||
def mounted_helpers(name = :app)
|
||||
def mounted_helpers(name = :main_app)
|
||||
define_mounted_helper(name) if name
|
||||
MountedHelpers
|
||||
end
|
||||
|
|
|
@ -83,9 +83,9 @@ module TestGenerationPrefix
|
|||
end
|
||||
|
||||
def url_to_application
|
||||
path = app.url_for( :controller => "outside_engine_generating",
|
||||
:action => "index",
|
||||
:only_path => true)
|
||||
path = main_app.url_for(:controller => "outside_engine_generating",
|
||||
:action => "index",
|
||||
:only_path => true)
|
||||
render :text => path
|
||||
end
|
||||
|
||||
|
|
|
@ -61,7 +61,7 @@ module ApplicationTests
|
|||
|
||||
require "#{app_path}/config/environment"
|
||||
assert Foo.method_defined?(:foo_path)
|
||||
assert Foo.method_defined?(:app)
|
||||
assert Foo.method_defined?(:main_app)
|
||||
assert_equal ["notify"], Foo.action_methods
|
||||
end
|
||||
|
||||
|
|
|
@ -437,7 +437,7 @@ module RailtiesTest
|
|||
end
|
||||
|
||||
def routes_helpers_in_view
|
||||
render :inline => "<%= foo_path %>, <%= app.bar_path %>"
|
||||
render :inline => "<%= foo_path %>, <%= main_app.bar_path %>"
|
||||
end
|
||||
|
||||
def polymorphic_path_without_namespace
|
||||
|
|
|
@ -70,14 +70,14 @@ module ApplicationTests
|
|||
end
|
||||
|
||||
def generate_application_route
|
||||
path = app.url_for(:controller => "/main",
|
||||
path = main_app.url_for(:controller => "/main",
|
||||
:action => "index",
|
||||
:only_path => true)
|
||||
render :text => path
|
||||
end
|
||||
|
||||
def application_route_in_view
|
||||
render :inline => "<%= app.root_path %>"
|
||||
render :inline => "<%= main_app.root_path %>"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue