diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-12-18 10:49:30 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-12-18 10:49:30 +0100 |
| commit | 13007e57ba74e35993e53a499837ed6fba6907c3 (patch) | |
| tree | 073c8f4b753856e2013116e02a248440404227d5 /railties | |
| parent | cd53b05be8f74dfc9c872eb1e84cd024e754f48d (diff) | |
| parent | 703f1052ae2e5da3d5ef18a759c03ba5692f1e24 (diff) | |
| download | rails-13007e57ba74e35993e53a499837ed6fba6907c3.tar.gz rails-13007e57ba74e35993e53a499837ed6fba6907c3.tar.bz2 rails-13007e57ba74e35993e53a499837ed6fba6907c3.zip | |
Merge pull request #22659 from y-yagi/fix_indent_in_controller_test
fix indentation of generated controller test
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/test_unit/scaffold/templates/api_functional_test.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/test_unit/scaffold/templates/api_functional_test.rb b/railties/lib/rails/generators/test_unit/scaffold/templates/api_functional_test.rb index de5814eae9..0d18478043 100644 --- a/railties/lib/rails/generators/test_unit/scaffold/templates/api_functional_test.rb +++ b/railties/lib/rails/generators/test_unit/scaffold/templates/api_functional_test.rb @@ -2,10 +2,10 @@ require 'test_helper' <% module_namespacing do -%> class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTest - <% if mountable_engine? -%> + <%- if mountable_engine? -%> include Engine.routes.url_helpers - <% end -%> + <%- end -%> setup do @<%= singular_table_name %> = <%= fixture_name %>(:one) end diff --git a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb index 8af14e84dc..0e6bef12fc 100644 --- a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb +++ b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb @@ -5,7 +5,7 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe <%- if mountable_engine? -%> include Engine.routes.url_helpers - <% end -%> + <%- end -%> setup do @<%= singular_table_name %> = <%= fixture_name %>(:one) end |