diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-06-06 02:16:33 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-06-06 02:16:33 -0700 |
| commit | 7682f7004d8ece950b295e9edd8e3e039e486ab2 (patch) | |
| tree | 399e60adeaaeffe8cda595648836e1894e408100 /railties/test | |
| parent | 870310db6a9f3c4ef70831cbc31271d567c90137 (diff) | |
| parent | 686966a1861e6761021d45f6795de753e8a62216 (diff) | |
| download | rails-7682f7004d8ece950b295e9edd8e3e039e486ab2.tar.gz rails-7682f7004d8ece950b295e9edd8e3e039e486ab2.tar.bz2 rails-7682f7004d8ece950b295e9edd8e3e039e486ab2.zip | |
Merge pull request #6643 from fredwu/fix_require_dependency
Fixed the application_controller require_dependency path generated by the app generator
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/namespaced_generators_test.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb index 09169ef2d2..2ae9dc61a7 100644 --- a/railties/test/generators/namespaced_generators_test.rb +++ b/railties/test/generators/namespaced_generators_test.rb @@ -38,7 +38,9 @@ class NamespacedControllerGeneratorTest < NamespacedGeneratorTestCase def test_namespaced_controller_with_additional_namespace run_generator ["admin/account"] - assert_file "app/controllers/test_app/admin/account_controller.rb", /module TestApp/, / class Admin::AccountController < ApplicationController/ + assert_file "app/controllers/test_app/admin/account_controller.rb", /module TestApp/, / class Admin::AccountController < ApplicationController/ do |contents| + assert_match %r(require_dependency "test_app/application_controller"), contents + end end def test_helpr_is_also_namespaced |