aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorJey Balachandran <jey.balachandran@gmail.com>2015-12-18 22:32:06 -0500
committerJey Balachandran <jey.balachandran@gmail.com>2015-12-21 15:27:42 -0500
commit96093e3cf79c0e809e13b02d12e0705f7acfdf31 (patch)
tree223d2ecbb1809580a3932b068d0c3292c12d1292 /railties/lib/rails
parent914a45b5fef39c436322bca02566d0d11e1cbb84 (diff)
downloadrails-96093e3cf79c0e809e13b02d12e0705f7acfdf31.tar.gz
rails-96093e3cf79c0e809e13b02d12e0705f7acfdf31.tar.bz2
rails-96093e3cf79c0e809e13b02d12e0705f7acfdf31.zip
Ensure Action Cable files are removed when `skip_action_cable` is set.
The Action Cable generators creates four files which need to be removed if `skip_action_cable` is set. 1. `app/assets/javascripts/cable.coffee` 2. `app/channels/application_cable/channel.rb` 3. `app/channels/application_cable/connection.rb` 4. `config/redis/cable.yml` Fixes #22669.
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb8
1 files changed, 8 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 44bbc478d0..0819e6c01f 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -313,6 +313,14 @@ module Rails
end
end
+ def delete_action_cable_files_skipping_action_cable
+ if options[:skip_action_cable]
+ remove_file 'config/redis/cable.yml'
+ remove_file 'app/assets/javascripts/cable.coffee'
+ remove_dir 'app/channels'
+ end
+ end
+
def delete_non_api_initializers_if_api_option
if options[:api]
remove_file 'config/initializers/session_store.rb'