Api apps scaffold does not generate assets

3 files changed, 8 insertions, 1 deletions

diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 9ff0e47aea..68d2a121fd 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -108,6 +108,7 @@ module Rails
 
       options[:rails].merge!(
         api: true,
+        assets: false,
         helper: false,
         template_engine: nil
       )
diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb
index 6cb2bfd77b..36298f2385 100644
--- a/railties/test/application/generators_test.rb
+++ b/railties/test/application/generators_test.rb
@@ -140,6 +140,7 @@ module ApplicationTests
       assert Rails::Generators.hidden_namespaces.include?("js")
       assert Rails::Generators.hidden_namespaces.include?("css")
       assert Rails::Generators.options[:rails][:api]
+      assert_equal false, Rails::Generators.options[:rails][:assets]
       assert_equal false, Rails::Generators.options[:rails][:helper]
       assert_nil Rails::Generators.options[:rails][:template_engine]
     end
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index 05a5c926eb..775f4b4ff5 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -88,7 +88,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_api_scaffold_on_invoke
-    run_generator %w(product_line title:string product:belongs_to user:references --api --no-template-engine --no-helper)
+    run_generator %w(product_line title:string product:belongs_to user:references --api --no-template-engine --no-helper --no-assets)
 
     # Model
     assert_file "app/models/product_line.rb", /class ProductLine < ActiveRecord::Base/
@@ -150,6 +150,11 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
 
     # Helpers
     assert_no_file "app/helpers/product_lines_helper.rb"
+
+    # Assets
+    assert_no_file "app/assets/stylesheets/scaffold.css"
+    assert_no_file "app/assets/javascripts/product_lines.js"
+    assert_no_file "app/assets/stylesheets/product_lines.css"
   end
 
   def test_functional_tests_without_attributes