minor refactoring of flash messages

spec/controllers/application_controller_spec.rb

@@ -22,18 +22,13 @@ describe ApplicationController do
   end
 
   describe '#render_not_authorized' do
-    let(:render_not_authorized) { controller.send(:render_not_authorized) }
-
-    it 'displays a flash message' do
-      expect(controller).to receive(:redirect_to)
-      render_not_authorized
-      expect(flash[:danger]).to eq(I18n.t('application.not_authorized'))
+    before(:each) do
+      expect(controller).to receive(:welcome) { controller.send(:render_not_authorized) }
+      get :welcome
     end
 
-    it 'redirects to the root URL' do
-      expect(controller).to receive(:redirect_to).with(:root)
-      render_not_authorized
-    end
+    expect_flash_message(:alert, I18n.t('application.not_authorized'))
+    expect_redirect(:root)
   end
 
   describe '#set_locale' do

spec/controllers/execution_environments_controller_spec.rb

@@ -118,10 +118,7 @@ describe ExecutionEnvironmentsController do
       end
 
       expect_assigns(docker_images: Array)
-
-      it 'displays a flash message' do
-        expect(flash[:warning]).to eq(error_message)
-      end
+      expect_flash_message(:warning, :error_message)
     end
   end
 

spec/controllers/exercises_controller_spec.rb

@@ -46,8 +46,7 @@ describe ExercisesController do
       end
 
       expect_assigns(exercise: Exercise)
-
-      expect_flash_message(:danger)
+      expect_flash_message(:danger, :'shared.message_failure')
       expect_redirect(:exercise)
     end
   end

spec/controllers/internal_users_controller_spec.rb

@@ -180,6 +180,7 @@ describe InternalUsersController do
         get :forgot_password
       end
 
+      expect_flash_message(:alert, :'shared.already_signed_in')
       expect_redirect(:root)
     end
   end

spec/controllers/sessions_controller_spec.rb

@@ -103,25 +103,25 @@ describe SessionsController do
       end
 
       context 'when LTI outcomes are supported' do
+        let(:message) { I18n.t('sessions.create_through_lti.session_with_outcome', consumer: consumer) }
+
         before(:each) do
           expect(controller).to receive(:lti_outcome_service?).and_return(true)
           request
         end
 
-        it 'displays a flash message' do
-          expect(flash[:notice]).to eq(I18n.t('sessions.create_through_lti.session_with_outcome', consumer: consumer))
-        end
+        expect_flash_message(:notice, :message)
       end
 
       context 'when LTI outcomes are not supported' do
+        let(:message) { I18n.t('sessions.create_through_lti.session_without_outcome', consumer: consumer) }
+
         before(:each) do
           expect(controller).to receive(:lti_outcome_service?).and_return(false)
           request
         end
 
-        it 'displays a flash message' do
-          expect(flash[:notice]).to eq(I18n.t('sessions.create_through_lti.session_without_outcome', consumer: consumer))
-        end
+        expect_flash_message(:notice, :message)
       end
 
       it 'redirects to the requested exercise' do
@@ -206,6 +206,7 @@ describe SessionsController do
         get :new
       end
 
+      expect_flash_message(:alert, :'shared.already_signed_in')
       expect_redirect(:root)
     end
   end

spec/support/controllers.rb

@@ -24,7 +24,7 @@ end
 def expect_flash_message(type, message = nil)
   it 'displays a flash message' do
     if message
-      expect(flash[type]).to eq(message.is_a?(String) ? message : I18n.t(message))
+      expect(flash[type]).to eq(obtain_message(message))
     else
       expect(flash[type]).to be_present
     end
@@ -59,13 +59,25 @@ def expect_template(template)
   end
 end
 
-def obtain_object(value)
-  case value
+def obtain_object(object)
+  case object
   when Proc
-    value.call
+    object.call
   when Symbol
-    send(value)
+    send(object)
   else
-    value
+    object
   end
 end
+private :obtain_object
+
+def obtain_message(object)
+  if object.is_a?(String)
+    object
+  elsif I18n.translation_present?(object)
+    I18n.t(object)
+  else
+    send(object)
+  end
+end
+private :obtain_message