Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #15150 from xtian/fix-railties-tests

Fix app generator test hanging.
  • Loading branch information...
commit 1b8529ec028d5189d3c104fcf470824d3ada7ff2 2 parents 53c8719 + 75ba742
Guillermo Iguaran guilleiguaran authored
4 railties/lib/rails/generators/rails/app/app_generator.rb
View
@@ -194,10 +194,6 @@ def create_bin_files
build(:bin)
end
- def create_config_files
- build(:config)
- end
-
def update_config_files
build(:config_when_updating)
end
4 railties/test/generators/app_generator_test.rb
View
@@ -119,7 +119,7 @@ def test_application_name_is_detected_if_it_exists_and_app_folder_renamed
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 @@ def test_rails_update_generates_correct_session_key
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
Please sign in to comment.
Something went wrong with that request. Please try again.