diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-12-22 06:31:49 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-12-22 06:31:49 -0700 |
| commit | 89fedb4dac1315c271d782290a29c4cd94035184 (patch) | |
| tree | 2702250b96c1aad443a0fa31c256b96b9b74c1d2 /railties | |
| parent | c8ca57df5bac623b115261ca0d2f1bdada467ff7 (diff) | |
| parent | 9917c0c255e1c1005b85885a15cc9a28bb8e4275 (diff) | |
| download | rails-89fedb4dac1315c271d782290a29c4cd94035184.tar.gz rails-89fedb4dac1315c271d782290a29c4cd94035184.tar.bz2 rails-89fedb4dac1315c271d782290a29c4cd94035184.zip | |
Merge pull request #22755 from y-yagi/remove_cors_initializer_from_rails_app
remove cors initializer from rails app
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 6 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 16efa96207..f4deec7135 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -329,6 +329,12 @@ module Rails end end + def delete_api_initializers + unless options[:api] + remove_file 'config/initializers/cors.rb' + end + end + def finish_template build(:leftovers) end diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 66997c5f5e..314d8c50b0 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -151,6 +151,12 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file("config/initializers/cookies_serializer.rb", /Rails\.application\.config\.action_dispatch\.cookies_serializer = :json/) end + def test_new_application_not_include_api_initializers + run_generator + + assert_no_file 'config/initializers/cors.rb' + end + def test_rails_update_keep_the_cookie_serializer_if_it_is_already_configured app_root = File.join(destination_root, 'myapp') run_generator [app_root] |