Merge pull request #6227 from mamhoff/no-javascripts-in-dummy-apps

Dummy app generator: Only configure app/assets/javascripts if present

Author: tvdeyen

core/lib/generators/spree/dummy/dummy_generator.rb

@@ -54,6 +54,7 @@ def generate_test_dummy
     def test_dummy_config
       @lib_name = options[:lib_name]
       @database = options[:database]
+      @has_javascripts = Dir.exist?("#{dummy_path}/app/assets/javascripts")
 
       template "rails/database.yml", "#{dummy_path}/config/database.yml", force: true
       template "rails/storage.yml", "#{dummy_path}/config/storage/test.yml", force: true

…/spree/dummy/templates/rails/manifest.js …ree/dummy/templates/rails/manifest.js.ttcore/lib/generators/spree/dummy/templates/rails/manifest.js renamed to core/lib/generators/spree/dummy/templates/rails/manifest.js.tt core/lib/generators/spree/dummy/templates/rails/manifest.js renamed to core/lib/generators/spree/dummy/templates/rails/manifest.js.tt

@@ -1,3 +1,5 @@
 //= link_tree ../images
+<% if @has_javascripts %>
 //= link_directory ../javascripts .js
+<% end %>
 //= link_directory ../stylesheets .css