Redirect users after sign in to their desired page

spec/controllers/application_controller_spec.rb

@@ -30,11 +30,26 @@ RSpec.describe ApplicationController do
   describe '#render_not_authorized' do
     before do
       allow(controller).to receive(:welcome) { controller.send(:render_not_authorized) }
+      login_user(user) if defined?(user)
       get :welcome
     end
 
-    expect_flash_message(:alert, I18n.t('application.not_authorized'))
-    expect_redirect(:root)
+    expect_flash_message(:alert, I18n.t('application.not_signed_in'))
+    expect_redirect(:sign_in)
+
+    context 'with an admin' do
+      let(:user) { create(:admin) }
+
+      expect_flash_message(:alert, I18n.t('application.not_authorized'))
+      expect_redirect(:root)
+    end
+
+    context 'with a teacher' do
+      let(:user) { create(:teacher) }
+
+      expect_flash_message(:alert, I18n.t('application.not_authorized'))
+      expect_redirect(:root)
+    end
   end
 
   describe '#render_not_found' do
@@ -44,19 +59,21 @@ RSpec.describe ApplicationController do
       get :welcome
     end
 
-    expect_flash_message(:alert, I18n.t('application.not_authorized'))
-    expect_redirect(:root)
+    expect_flash_message(:alert, I18n.t('application.not_signed_in'))
+    expect_redirect(:sign_in)
 
     context 'with an admin' do
       let(:user) { create(:admin) }
 
       expect_flash_message(:alert, I18n.t('application.not_found'))
+      expect_redirect(:root)
     end
 
     context 'with a teacher' do
       let(:user) { create(:teacher) }
 
       expect_flash_message(:alert, I18n.t('application.not_authorized'))
+      expect_redirect(:root)
     end
   end
 

spec/controllers/internal_users_controller_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe InternalUsersController do
     context 'without a valid activation token' do
       before { get :activate, params: {id: user.id} }
 
-      expect_redirect(:root)
+      expect_redirect(:sign_in)
     end
 
     context 'with an already activated user' do
@@ -28,7 +28,7 @@ RSpec.describe InternalUsersController do
         get :activate, params: {id: user.id, token: user.activation_token}
       end
 
-      expect_redirect(:root)
+      expect_redirect(:sign_in)
     end
 
     context 'with valid preconditions' do
@@ -56,7 +56,7 @@ RSpec.describe InternalUsersController do
     context 'without a valid activation token' do
       before { put :activate, params: {id: user.id} }
 
-      expect_redirect(:root)
+      expect_redirect(:sign_in)
     end
 
     context 'with an already activated user' do
@@ -65,7 +65,7 @@ RSpec.describe InternalUsersController do
         put :activate, params: {id: user.id, internal_user: {activation_token: user.activation_token, password:, password_confirmation: password}}
       end
 
-      expect_redirect(:root)
+      expect_redirect(:sign_in)
     end
 
     context 'without a password' do
@@ -249,7 +249,7 @@ RSpec.describe InternalUsersController do
     context 'without a valid password reset token' do
       before { get :reset_password, params: {id: user.id} }
 
-      expect_redirect(:root)
+      expect_redirect(:sign_in)
     end
 
     context 'with a valid password reset token' do
@@ -270,7 +270,7 @@ RSpec.describe InternalUsersController do
     context 'without a valid password reset token' do
       before { put :reset_password, params: {id: user.id} }
 
-      expect_redirect(:root)
+      expect_redirect(:sign_in)
     end
 
     context 'with a valid password reset token' do