diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-04 05:33:34 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-04 05:33:34 -0700 |
commit | 29dce6e4b540d01bd5fd3ba7b31d2b0efc43bf81 (patch) | |
tree | 2d1559533a2e50c3c3902cfbf9398490496f2c8a | |
parent | cc50aab3babfac508b03e6f6a21a101ef9c12929 (diff) | |
parent | f354ad1b69188009b5dc2827f19f634730fcf923 (diff) | |
download | rails-29dce6e4b540d01bd5fd3ba7b31d2b0efc43bf81.tar.gz rails-29dce6e4b540d01bd5fd3ba7b31d2b0efc43bf81.tar.bz2 rails-29dce6e4b540d01bd5fd3ba7b31d2b0efc43bf81.zip |
Merge pull request #10436 from NARKOZ/keep-images
generate 'app/assets/images' directory when creating new rails app. Fixes #10434
3 files changed, 6 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index b2d1be9b51..5877579fc4 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -56,6 +56,7 @@ module Rails def app directory 'app' + keep_file 'app/assets/images' keep_file 'app/mailers' keep_file 'app/models' diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/images/.keep b/railties/lib/rails/generators/rails/app/templates/app/assets/images/.keep deleted file mode 100644 index e69de29bb2..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/app/assets/images/.keep +++ /dev/null diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index f70c90bffa..0ffb615764 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -260,6 +260,11 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file 'test' end + def test_creation_of_app_assets_images_directory + run_generator + assert_file "app/assets/images" + end + def test_creation_of_vendor_assets_javascripts_directory run_generator assert_file "vendor/assets/javascripts" |