diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-05-17 12:40:06 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-05-17 12:40:06 -0500 |
| commit | 1b8529ec028d5189d3c104fcf470824d3ada7ff2 (patch) | |
| tree | 88e35cb11cb2cb7d04f6ef785925b7cc5b49faba /railties/test/generators/app_generator_test.rb | |
| parent | 53c87195f014d280aa2aabf21858f4edba866cf6 (diff) | |
| parent | 75ba7425f6d235f254c00a45a58f42e88f80301a (diff) | |
| download | rails-1b8529ec028d5189d3c104fcf470824d3ada7ff2.tar.gz rails-1b8529ec028d5189d3c104fcf470824d3ada7ff2.tar.bz2 rails-1b8529ec028d5189d3c104fcf470824d3ada7ff2.zip | |
Merge pull request #15150 from xtian/fix-railties-tests
Fix app generator test hanging.
Diffstat (limited to 'railties/test/generators/app_generator_test.rb')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 007dd886da..4beb362ef9 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -119,7 +119,7 @@ class AppGeneratorTest < Rails::Generators::TestCase generator = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true }, destination_root: app_moved_root, shell: @shell generator.send(:app_const) - quietly { generator.send(:create_config_files) } + quietly { generator.send(:update_config_files) } assert_file "myapp_moved/config/environment.rb", /Rails\.application\.initialize!/ assert_file "myapp_moved/config/initializers/session_store.rb", /_myapp_session/ end @@ -134,7 +134,7 @@ class AppGeneratorTest < Rails::Generators::TestCase generator = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true }, destination_root: app_root, shell: @shell generator.send(:app_const) - quietly { generator.send(:create_config_files) } + quietly { generator.send(:update_config_files) } assert_file "myapp/config/initializers/session_store.rb", /_myapp_session/ end |