1 files changed, 16 insertions, 3 deletions
diff --git a/railties/test/generators/api_app_generator_test.rb b/railties/test/generators/api_app_generator_test.rb
index 998da3ef84..8e1cd0891a 100644
--- a/railties/test/generators/api_app_generator_test.rb
+++ b/railties/test/generators/api_app_generator_test.rb
@@ -37,9 +37,8 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase
       assert_no_match(/gem 'coffee-rails'/, content)
       assert_no_match(/gem 'jquery-rails'/, content)
       assert_no_match(/gem 'sass-rails'/, content)
-      assert_no_match(/gem 'jbuilder'/, content)
       assert_no_match(/gem 'web-console'/, content)
-      assert_match(/gem 'active_model_serializers'/, content)
+      assert_match(/# gem 'jbuilder'/, content)
     end
 
     assert_file "config/application.rb" do |content|
@@ -53,6 +52,16 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase
     assert_file "app/controllers/application_controller.rb", /ActionController::API/
   end
 
+  def test_generator_if_skip_action_cable_is_given
+    run_generator [destination_root, "--skip-action-cable"]
+    assert_file "config/application.rb", /#\s+require\s+["']action_cable\/engine["']/
+    assert_no_file "config/cable.yml"
+    assert_no_file "app/channels"
+    assert_file "Gemfile" do |content|
+      assert_no_match(/redis/, content)
+    end
+  end
+
   private
 
   def default_files
@@ -64,6 +73,8 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase
       app/controllers
       app/mailers
       app/models
+      app/views/layouts/mailer.html.erb
+      app/views/layouts/mailer.text.erb
       config/environments
       config/initializers
       config/locales
@@ -85,10 +96,12 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase
   def skipped_files
     %w(app/assets
        app/helpers
-       app/views
+       app/views/layouts/application.html.erb
        config/initializers/assets.rb
        config/initializers/cookies_serializer.rb
        config/initializers/session_store.rb
+       config/initializers/request_forgery_protection.rb
+       config/initializers/per_form_csrf_tokens.rb
        lib/assets
        vendor/assets
        test/helpers