aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-06-29 14:17:30 +0200
committerYves Senn <yves.senn@gmail.com>2015-06-29 14:23:26 +0200
commit3cd0530df6eddf3b68cd42e5893ed0eb702ba780 (patch)
tree373225c976c1af2ff2cddd863e87a8982f6dcdff /railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb
parentd4b0e5f59f599a386d43a7f4d005430e87ae7ec4 (diff)
parentb1738e1a0222d5109cd906e3eb34458741a615db (diff)
downloadrails-3cd0530df6eddf3b68cd42e5893ed0eb702ba780.tar.gz
rails-3cd0530df6eddf3b68cd42e5893ed0eb702ba780.tar.bz2
rails-3cd0530df6eddf3b68cd42e5893ed0eb702ba780.zip
Merge pull request #20724 from y-yagi/fix_scaffold_in_full_engine
fix NoMethodError that occurs when generating scaffold inside full mode engine
Diffstat (limited to 'railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb')
-rw-r--r--railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb
index 7106096b60..5a8a3ca5e0 100644
--- a/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb
+++ b/railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb
@@ -2,7 +2,7 @@ require 'test_helper'
<% module_namespacing do -%>
class <%= class_name %>ControllerTest < ActionController::TestCase
-<% if defined?(ENGINE_ROOT) -%>
+<% if mountable_engine? -%>
setup do
@routes = Engine.routes
end