Merge pull request #1441 from jrochkind/dummy_generator_does_not_need…

…_custom_user_init DummyGenerator doesn't need to create a custom_user.rb initializer
solidusio · Sep 16, 2016 · c98ab97 · c98ab97
2 parents d71375c + f04c131
commit c98ab97
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/core/lib/generators/spree/dummy/dummy_generator.rb b/core/lib/generators/spree/dummy/dummy_generator.rb
@@ -47,7 +47,6 @@ def test_dummy_config
       template "rails/routes.rb", "#{dummy_path}/config/routes.rb", force: true
       template "rails/test.rb", "#{dummy_path}/config/environments/test.rb", force: true
       template "rails/script/rails", "#{dummy_path}/spec/dummy/script/rails", force: true
-      template "initializers/custom_user.rb", "#{dummy_path}/config/initializers/custom_user.rb", force: true
 
       # FIXME: We aren't ready for rails 5 defaults
       remove_file "#{dummy_path}/config/initializers/new_framework_defaults.rb"

diff --git a/core/lib/generators/spree/dummy/templates/initializers/custom_user.rb b/core/lib/generators/spree/dummy/templates/initializers/custom_user.rb