aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/test_unit/controller
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-06-02 16:16:36 +0200
committerYves Senn <yves.senn@gmail.com>2015-06-02 16:20:40 +0200
commit939d5a493217bf5fa966495bc80440eeb0dbc29f (patch)
tree282737a610788a9edcf3a3da129c533962fde577 /railties/lib/rails/generators/test_unit/controller
parentb6b13905e5f2c5bb1e23166c3bac13672b597b03 (diff)
parent36127934751d61e08d0858db97e7a35aa6417f79 (diff)
downloadrails-939d5a493217bf5fa966495bc80440eeb0dbc29f.tar.gz
rails-939d5a493217bf5fa966495bc80440eeb0dbc29f.tar.bz2
rails-939d5a493217bf5fa966495bc80440eeb0dbc29f.zip
Merge pull request #20387 from y-yagi/fix_engine_generated_controller_test
set engine's route in the functional test is generated in the engine
Diffstat (limited to 'railties/lib/rails/generators/test_unit/controller')
-rw-r--r--railties/lib/rails/generators/test_unit/controller/templates/functional_test.rb6
1 files changed, 6 insertions, 0 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 509bd60564..7106096b60 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,6 +2,12 @@ require 'test_helper'
<% module_namespacing do -%>
class <%= class_name %>ControllerTest < ActionController::TestCase
+<% if defined?(ENGINE_ROOT) -%>
+ setup do
+ @routes = Engine.routes
+ end
+
+<% end -%>
<% if actions.empty? -%>
# test "the truth" do
# assert true