Merge pull request #246 from solidusio/elia/admin-root-path

Ensure the admin sign in root path fallback is '/admin'

Author: elia

.rubocop_todo.yml

@@ -105,7 +105,7 @@ RSpec/BeforeAfterAll:
 
 # Offense count: 5
 # This cop supports safe autocorrection (--autocorrect).
-RSpec/Capybara/CurrentPathExpectation:
+Capybara/CurrentPathExpectation:
   Exclude:
     - 'spec/features/admin/sign_in_spec.rb'
     - 'spec/features/sign_in_spec.rb'
@@ -221,7 +221,6 @@ RSpec/InstanceVariable:
     - 'spec/controllers/spree/admin/user_passwords_controller_spec.rb'
     - 'spec/controllers/spree/user_passwords_controller_spec.rb'
     - 'spec/controllers/spree/user_registrations_controller_spec.rb'
-    - 'spec/controllers/spree/user_sessions_controller_spec.rb'
     - 'spec/features/admin/sign_in_spec.rb'
     - 'spec/features/checkout_spec.rb'
     - 'spec/features/sign_in_spec.rb'

lib/controllers/backend/spree/admin/user_sessions_controller.rb

@@ -35,6 +35,10 @@ def authorization_failure
 
   private
 
+  def signed_in_root_path(_resource)
+    spree.admin_path
+  end
+
   # NOTE: as soon as this gem stops supporting Solidus 3.1 if-else should be removed and left only include
   if defined?(::Spree::Admin::SetsUserLanguageLocaleKey)
     include ::Spree::Admin::SetsUserLanguageLocaleKey

spec/controllers/spree/admin/user_sessions_controller_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+RSpec.describe Spree::Admin::UserSessionsController, type: :controller do
+  let(:user) { create(:user, password: 'secret') }
+
+  before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] } # rubocop:disable RSpec/InstanceVariable
+
+  it "redirects to the admin root after signing in with no stored location" do
+    get :new
+
+    post(:create, params: {
+      spree_user: {
+        email: user.email,
+        password: 'secret'
+      },
+    })
+
+    expect(response).to redirect_to spree.admin_path
+  end
+end

spec/controllers/spree/user_sessions_controller_spec.rb

@@ -3,22 +3,20 @@
 RSpec.describe Spree::UserSessionsController, type: :controller do
   let(:user) { create(:user) }
 
-  before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] }
+  before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] } # rubocop:disable RSpec/InstanceVariable
 
   context "#create" do
     let(:format) { :html }
     let(:password) { 'secret' }
 
     subject do
-      post(:create,
-        params: {
-          spree_user: {
-            email: user.email,
-            password: password
-          },
-          format: format
-        }
-      )
+      post(:create, params: {
+        spree_user: {
+          email: user.email,
+          password: password
+        },
+        format: format
+      })
     end
 
     context "when using correct login information" do

spec/features/admin/sign_in_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.feature 'Admin - Sign In', type: :feature do
   background do
-    @user = create(:user, email: 'email@person.com')
+    @user = create(:admin_user, email: 'email@person.com')
     visit spree.admin_login_path
   end
 
@@ -19,7 +19,7 @@
     expect(page).to have_text 'Logged in successfully'
     expect(page).not_to have_text 'Login'
     expect(page).to have_text 'Logout'
-    expect(current_path).to eq '/'
+    expect(current_path).to eq '/admin/orders'
   end
 
   scenario 'shows validation erros' do