aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb1
-rw-r--r--railties/test/generators/api_app_generator_test.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index bd096d3c16..4ad78137f0 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -262,6 +262,7 @@ module Rails
def delete_app_assets_if_api_option
if options[:api]
remove_dir 'app/assets'
+ remove_dir 'lib/assets'
end
end
diff --git a/railties/test/generators/api_app_generator_test.rb b/railties/test/generators/api_app_generator_test.rb
index 3eb9815b75..1aa3884466 100644
--- a/railties/test/generators/api_app_generator_test.rb
+++ b/railties/test/generators/api_app_generator_test.rb
@@ -62,7 +62,6 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase
db
lib
lib/tasks
- lib/assets
log
test/fixtures
test/controllers
@@ -80,6 +79,7 @@ class ApiAppGeneratorTest < Rails::Generators::TestCase
config/initializers/assets.rb
config/initializers/cookies_serializer.rb
config/initializers/session_store.rb
+ lib/assets
vendor/assets
test/helpers
tmp/cache/assets)