diff options
author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2015-10-12 14:39:53 +0900 |
---|---|---|
committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2015-10-12 14:47:40 +0900 |
commit | 12248b885c9d6f8bf38698a87d2c453f134d96bb (patch) | |
tree | 65b04ab9df27048bf113d0886eb8648ed537d552 /railties | |
parent | f50d953ff646b84a1c791a8034cfb4f3789fc8bf (diff) | |
download | rails-12248b885c9d6f8bf38698a87d2c453f134d96bb.tar.gz rails-12248b885c9d6f8bf38698a87d2c453f134d96bb.tar.bz2 rails-12248b885c9d6f8bf38698a87d2c453f134d96bb.zip |
do not generate manifest.js in plugins
Since the plugin generator do not generate assets, I think manifest.js also that it unnecessary.
Diffstat (limited to 'railties')
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/plugin_generator.rb | 2 | ||||
-rw-r--r-- | railties/test/generators/plugin_generator_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb index 910c4e743e..81bc902bde 100644 --- a/railties/lib/rails/generators/rails/plugin/plugin_generator.rb +++ b/railties/lib/rails/generators/rails/plugin/plugin_generator.rb @@ -226,7 +226,7 @@ task default: :test end def create_assets_manifest_file - build(:assets_manifest) unless api? + build(:assets_manifest) if !api? && engine? end def create_public_stylesheets_files diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb index 0625e5fbd7..e57c61d47c 100644 --- a/railties/test/generators/plugin_generator_test.rb +++ b/railties/test/generators/plugin_generator_test.rb @@ -60,6 +60,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase run_generator assert_file "README.rdoc", /Bukkits/ assert_no_file "config/routes.rb" + assert_no_file "app/assets/config/bukkits_manifest.js" assert_file "test/test_helper.rb" do |content| assert_match(/require.+test\/dummy\/config\/environment/, content) assert_match(/ActiveRecord::Migrator\.migrations_paths.+test\/dummy\/db\/migrate/, content) |