Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Revert "Skips tandard devise routes during installation"

Damian Legawiecb4022a6c2e00
diff --git a/core/lib/spree/testing_support/common_rake.rb b/core/lib/spree/testing_support/common_rake.rb
index 8c079e6715..cc8f5c1b57 100644
--- a/core/lib/spree/testing_support/common_rake.rb
+++ b/core/lib/spree/testing_support/common_rake.rb
@@ -37,8 +37,8 @@ namespace :common do
# install devise if it's not the legacy user, useful for testing storefront
if args[:authentication] == 'devise' && args[:user_class] != 'Spree::LegacyUser'
system('bundle exec rails g devise:install --force --auto-accept')
- system("bundle exec rails g devise #{args[:user_class]} --force --auto-accept --skip-routes")
- system("bundle exec rails g devise #{args[:admin_user_class]} --force --auto-accept --skip-routes") if args[:admin_user_class].present? && args[:admin_user_class] != args[:user_class]
+ system("bundle exec rails g devise #{args[:user_class]} --force --auto-accept")
+ system("bundle exec rails g devise #{args[:admin_user_class]} --force --auto-accept") if args[:admin_user_class].present? && args[:admin_user_class] != args[:user_class]
system('rm -rf spec') # we need to cleanup factories created by devise to avoid naming conflict
end
diff --git a/template.rb b/template.rb
index a0ead86a1f..df467265ae 100644
--- a/template.rb
+++ b/template.rb
@@ -54,12 +54,12 @@ def setup_auth
if VERBOSE
rails_command 'generate devise:install'
- rails_command 'generate devise Spree::User --skip-routes'
- rails_command 'generate devise Spree::AdminUser --skip-routes'
+ rails_command 'generate devise Spree::User'
+ rails_command 'generate devise Spree::AdminUser'
else
run 'bin/rails generate devise:install >/dev/null 2>&1'
- run 'bin/rails generate devise Spree::User --skip-routes >/dev/null 2>&1'
- run 'bin/rails generate devise Spree::AdminUser --skip-routes >/dev/null 2>&1'
+ run 'bin/rails generate devise Spree::User >/dev/null 2>&1'
+ run 'bin/rails generate devise Spree::AdminUser >/dev/null 2>&1'
end
end