diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-01-22 08:00:01 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-01-22 08:00:01 +0100 |
| commit | 5d9e923d279f26e117d68d442e5c88a33341fe67 (patch) | |
| tree | 75a94903155f2ad7480cfecc97b2009affdc83d2 | |
| parent | 24a316d15f5d9204016ae7d31a1b30fb35529028 (diff) | |
| parent | cd0d649dc4cbe0bc40871017ab48e2ede8591482 (diff) | |
| download | rails-5d9e923d279f26e117d68d442e5c88a33341fe67.tar.gz rails-5d9e923d279f26e117d68d442e5c88a33341fe67.tar.bz2 rails-5d9e923d279f26e117d68d442e5c88a33341fe67.zip | |
Merge pull request #23174 from JuanitoFatas/followup-skip-action-cable
Remove action_cable_meta_tag when skip Action Cable
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 1 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 3 |
2 files changed, 4 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 7ec4d3bbd3..9248e16585 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -318,6 +318,7 @@ module Rails remove_file 'config/cable.yml' remove_file 'app/assets/javascripts/cable.coffee' remove_dir 'app/channels' + gsub_file 'app/views/layouts/application.html.erb', /action_cable_meta_tag/, '' end end diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 192fac764d..5b62b500e5 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -396,6 +396,9 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_no_file "config/cable.yml" assert_no_file "app/assets/javascripts/cable.coffee" assert_no_file "app/channels" + assert_file "app/views/layouts/application.html.erb" do |content| + assert_no_match(/action_cable_meta_tag/, content) + end assert_file "Gemfile" do |content| assert_no_match(/em-hiredis/, content) assert_no_match(/redis/, content) |