Merge pull request #23600 from maclover7/actioncable-work

Assorted Railties generators work

3 files changed, 25 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 885f0c20f6..07d38605a2 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -91,6 +91,7 @@ module Rails
       cookie_serializer_config_exist = File.exist?('config/initializers/cookies_serializer.rb')
       callback_terminator_config_exist = File.exist?('config/initializers/callback_terminator.rb')
       active_record_belongs_to_required_by_default_config_exist = File.exist?('config/initializers/active_record_belongs_to_required_by_default.rb')
+      action_cable_config_exist = File.exist?('config/cable.yml')
 
       config
 
@@ -105,6 +106,10 @@ module Rails
       unless active_record_belongs_to_required_by_default_config_exist
         remove_file 'config/initializers/active_record_belongs_to_required_by_default.rb'
       end
+
+      unless action_cable_config_exist
+        template 'config/cable.yml'
+      end
     end
 
     def database_yml
diff --git a/railties/test/generators/channel_generator_test.rb b/railties/test/generators/channel_generator_test.rb
index c1f0c03fbf..e31736a74c 100644
--- a/railties/test/generators/channel_generator_test.rb
+++ b/railties/test/generators/channel_generator_test.rb
@@ -5,6 +5,18 @@ class ChannelGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
   tests Rails::Generators::ChannelGenerator
 
+  def test_application_cable_skeleton_is_created
+     run_generator ['books']
+
+     assert_file "app/channels/application_cable/channel.rb" do |cable|
+       assert_match(/module ApplicationCable\n  class Channel < ActionCable::Channel::Base\n/, cable)
+     end
+
+     assert_file "app/channels/application_cable/connection.rb" do |cable|
+       assert_match(/module ApplicationCable\n  class Connection < ActionCable::Connection::Base\n/, cable)
+     end
+   end
+
   def test_channel_is_created
     run_generator ['chat']
 
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index c8c8f0aa3b..ed6846abc3 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -6,6 +6,14 @@ class ModelGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
   arguments %w(Account name:string age:integer)
 
+   def test_application_record_skeleton_is_created
+     run_generator
+     assert_file "app/models/application_record.rb" do |record|
+       assert_match(/class ApplicationRecord < ActiveRecord::Base/, record)
+       assert_match(/self.abstract_class = true/, record)
+     end
+   end
+
   def test_help_shows_invoked_generators_options
     content = run_generator ["--help"]
     assert_match(/ActiveRecord options:/, content)