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 "Redirect to sign up form instead of login page before entering checkout" (#12821)

Damian Legawiec6dd843b0c613
diff --git a/storefront/app/controllers/spree/checkout_controller.rb b/storefront/app/controllers/spree/checkout_controller.rb
index 318ac6934b..c9cd1a9656 100644
--- a/storefront/app/controllers/spree/checkout_controller.rb
+++ b/storefront/app/controllers/spree/checkout_controller.rb
@@ -188,7 +188,7 @@ module Spree
redirect_to spree.checkout_path(@order.token)
else
store_location
- redirect_to spree_signup_path
+ redirect_to spree_login_path
end
end
end
diff --git a/storefront/app/controllers/spree/store_controller.rb b/storefront/app/controllers/spree/store_controller.rb
index 84be0a131f..178b6f8a41 100644
--- a/storefront/app/controllers/spree/store_controller.rb
+++ b/storefront/app/controllers/spree/store_controller.rb
@@ -210,7 +210,7 @@ module Spree
store_location(return_to)
respond_to do |format|
- format.html { redirect_to spree_signup_path }
+ format.html { redirect_to spree_login_path }
format.turbo_stream { render turbo_stream: turbo_stream.slideover_open('slideover-account', 'account-pane') }
end
end
diff --git a/storefront/spec/controllers/spree/account/addresses_controller_spec.rb b/storefront/spec/controllers/spree/account/addresses_controller_spec.rb
index a0805f462a..4835855551 100644
--- a/storefront/spec/controllers/spree/account/addresses_controller_spec.rb
+++ b/storefront/spec/controllers/spree/account/addresses_controller_spec.rb
@@ -8,11 +8,8 @@ describe Spree::Account::AddressesController, type: :controller do
render_views
before do
- allow(controller).to receive_messages(
- current_store: store,
- spree_signup_path: '/signup',
- spree_login_path: '/login'
- )
+ allow(controller).to receive(:current_store).and_return(store)
+ allow(controller).to receive(:spree_login_path).and_return('/login')
end
describe '#index' do
@@ -38,9 +35,8 @@ describe Spree::Account::AddressesController, type: :controller do
end
context 'when user is not logged in' do
- it 'redirects to sign up page' do
+ it 'redirects to login page' do
expect(subject).to have_http_status(302)
- expect(response).to redirect_to('/signup')
end
end
end
diff --git a/storefront/spec/controllers/spree/account/orders_controller_spec.rb b/storefront/spec/controllers/spree/account/orders_controller_spec.rb
index 414122cb51..a2f18fd066 100644
--- a/storefront/spec/controllers/spree/account/orders_controller_spec.rb
+++ b/storefront/spec/controllers/spree/account/orders_controller_spec.rb
@@ -8,11 +8,8 @@ describe Spree::Account::OrdersController, type: :controller do
render_views
before do
- allow(controller).to receive_messages(
- current_store: store,
- spree_signup_path: '/signup',
- spree_login_path: '/login'
- )
+ allow(controller).to receive(:current_store).and_return(store)
+ allow(controller).to receive(:spree_login_path).and_return('/login')
end
describe '#index' do
@@ -79,9 +76,8 @@ describe Spree::Account::OrdersController, type: :controller do
end
context 'when user is not logged in' do
- it 'redirects to sign up page' do
+ it 'redirects to login page' do
expect(subject).to have_http_status(302)
- expect(response).to redirect_to('/signup')
end
end
end
diff --git a/storefront/spec/controllers/spree/account/store_credits_controller_spec.rb b/storefront/spec/controllers/spree/account/store_credits_controller_spec.rb
index 43eb297fb1..36569e5cdd 100644
--- a/storefront/spec/controllers/spree/account/store_credits_controller_spec.rb
+++ b/storefront/spec/controllers/spree/account/store_credits_controller_spec.rb
@@ -9,11 +9,8 @@ describe Spree::Account::StoreCreditsController, type: :controller do
render_views
before do
- allow(controller).to receive_messages(
- current_store: store,
- spree_signup_path: '/signup',
- spree_login_path: '/login'
- )
+ allow(controller).to receive(:current_store).and_return(store)
+ allow(controller).to receive(:spree_login_path).and_return('/login')
end
describe '#index' do
@@ -38,9 +35,8 @@ describe Spree::Account::StoreCreditsController, type: :controller do
end
context 'when user is not logged in' do
- it 'redirects to sign up page' do
+ it 'redirects to login page' do
expect(subject).to have_http_status(302)
- expect(response).to redirect_to('/signup')
end
end
end
diff --git a/storefront/spec/controllers/spree/account/wished_items_controller_spec.rb b/storefront/spec/controllers/spree/account/wished_items_controller_spec.rb
index da88fe0122..909915cfbd 100644
--- a/storefront/spec/controllers/spree/account/wished_items_controller_spec.rb
+++ b/storefront/spec/controllers/spree/account/wished_items_controller_spec.rb
@@ -10,13 +10,10 @@ describe Spree::Account::WishedItemsController, type: :controller do
render_views
before do
- allow(controller).to receive_messages(
- current_store: store,
- try_spree_current_user: user,
- current_wishlist: wishlist,
- spree_signup_path: '/signup',
- spree_login_path: '/login'
- )
+ allow(controller).to receive(:current_store).and_return(store)
+ allow(controller).to receive(:spree_login_path).and_return('/login')
+ allow(controller).to receive_messages try_spree_current_user: user
+ allow(controller).to receive(:current_wishlist).and_return(wishlist)
end
describe '#create' do
@@ -75,9 +72,8 @@ describe Spree::Account::WishedItemsController, type: :controller do
allow(controller).to receive(:try_spree_current_user).and_return(nil)
end
- it 'redirects to sign up page' do
+ it 'redirects to login page' do
expect(subject).to have_http_status(302)
- expect(response).to redirect_to('/signup')
end
end
diff --git a/storefront/spec/controllers/spree/checkout_controller_spec.rb b/storefront/spec/controllers/spree/checkout_controller_spec.rb
index 71f58286f7..326d5564e7 100644
--- a/storefront/spec/controllers/spree/checkout_controller_spec.rb
+++ b/storefront/spec/controllers/spree/checkout_controller_spec.rb
@@ -16,13 +16,10 @@ describe Spree::CheckoutController, type: :controller do
let(:accept_marketing) { true }
before do
- allow(controller).to receive_messages(
- current_store: store,
- try_spree_current_user: user,
- spree_current_user: user,
- spree_signup_path: '/signup',
- spree_login_path: '/login'
- )
+ allow(controller).to receive(:current_store).and_return(store)
+ allow(controller).to receive_messages try_spree_current_user: user
+ allow(controller).to receive_messages spree_current_user: user
+ allow(controller).to receive(:spree_login_path).and_return('/login')
end
describe '#edit' do
@@ -120,7 +117,7 @@ describe Spree::CheckoutController, type: :controller do
it 'redirects to the login page' do
get :edit, params: { token: order.token }
- expect(response).to redirect_to('/signup')
+ expect(response).to redirect_to('/login')
end
end
end
@@ -158,9 +155,9 @@ describe Spree::CheckoutController, type: :controller do
context 'when user is not logged in' do
let(:user) { nil }
- it 'redirects to sign up page' do
+ it 'redirects to login page' do
get :edit, params: { token: order.token }
- expect(response).to redirect_to('/signup')
+ expect(response).to redirect_to('/login')
end
context 'when guest checkout is allowed' do
diff --git a/storefront/spec/controllers/spree/wishlists_controller_spec.rb b/storefront/spec/controllers/spree/wishlists_controller_spec.rb
index 8aa23d0ed5..3c7c905b4e 100644
--- a/storefront/spec/controllers/spree/wishlists_controller_spec.rb
+++ b/storefront/spec/controllers/spree/wishlists_controller_spec.rb
@@ -10,11 +10,8 @@ describe Spree::WishlistsController, type: :controller do
render_views
before do
- allow(controller).to receive_messages(
- current_store: store,
- spree_signup_path: '/signup',
- spree_login_path: '/login'
- )
+ allow(controller).to receive(:current_store).and_return(store)
+ allow(controller).to receive(:spree_login_path).and_return('/login')
end
describe '#show' do