3 files changed, 28 insertions, 0 deletions
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)
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index 4111a30664..d7d27e6b2e 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -444,6 +444,14 @@ class PluginGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_dummy_appplication_skip_listen_by_default
+    run_generator
+
+    assert_file 'test/dummy/config/environments/development.rb' do |contents|
+      assert_match(/^\s*# config.file_watcher = ActiveSupport::EventedFileUpdateChecker/, contents)
+    end
+  end
+
   def test_ensure_that_gitignore_can_be_generated_from_a_template_for_dummy_path
     FileUtils.cd(Rails.root)
     run_generator([destination_root, "--dummy_path", "spec/dummy", "--skip-test"])