From 42c8b47d40ebda59a72de82779b540a1ddc14a13 Mon Sep 17 00:00:00 2001
From: Hauke Klement <dev@hklement.de>
Date: Tue, 24 Feb 2015 18:57:00 +0100
Subject: [PATCH] concretized redirection expectations in controller specs

---
 .../code_ocean/files_controller_spec.rb        |  2 +-
 spec/controllers/consumers_controller_spec.rb  |  4 ++--
 .../execution_environments_controller_spec.rb  |  4 ++--
 spec/controllers/exercises_controller_spec.rb  |  6 +++---
 spec/controllers/file_types_controller_spec.rb |  4 ++--
 spec/controllers/hints_controller_spec.rb      |  6 +++---
 .../internal_users_controller_spec.rb          | 18 +++++++++---------
 spec/controllers/sessions_controller_spec.rb   |  4 ++--
 spec/controllers/teams_controller_spec.rb      |  4 ++--
 9 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/spec/controllers/code_ocean/files_controller_spec.rb b/spec/controllers/code_ocean/files_controller_spec.rb
index 3adb76be..08062acb 100644
--- a/spec/controllers/code_ocean/files_controller_spec.rb
+++ b/spec/controllers/code_ocean/files_controller_spec.rb
@@ -42,6 +42,6 @@ describe CodeOcean::FilesController do
       expect { request.call }.to change(CodeOcean::File, :count).by(-1)
     end
 
-    expect_redirect
+    expect_redirect(:exercise)
   end
 end
diff --git a/spec/controllers/consumers_controller_spec.rb b/spec/controllers/consumers_controller_spec.rb
index 921fe404..1060c845 100644
--- a/spec/controllers/consumers_controller_spec.rb
+++ b/spec/controllers/consumers_controller_spec.rb
@@ -16,7 +16,7 @@ describe ConsumersController do
         expect { request.call }.to change(Consumer, :count).by(1)
       end
 
-      expect_redirect
+      expect_redirect(Consumer.last)
     end
 
     context 'with an invalid consumer' do
@@ -79,7 +79,7 @@ describe ConsumersController do
       before(:each) { put :update, consumer: FactoryGirl.attributes_for(:consumer), id: consumer.id }
 
       expect_assigns(consumer: Consumer)
-      expect_redirect
+      expect_redirect(:consumer)
     end
 
     context 'with an invalid consumer' do
diff --git a/spec/controllers/execution_environments_controller_spec.rb b/spec/controllers/execution_environments_controller_spec.rb
index db22403c..8166ccbb 100644
--- a/spec/controllers/execution_environments_controller_spec.rb
+++ b/spec/controllers/execution_environments_controller_spec.rb
@@ -19,7 +19,7 @@ describe ExecutionEnvironmentsController do
         expect { request.call }.to change(ExecutionEnvironment, :count).by(1)
       end
 
-      expect_redirect
+      expect_redirect(ExecutionEnvironment.last)
     end
 
     context 'with an invalid execution environment' do
@@ -150,7 +150,7 @@ describe ExecutionEnvironmentsController do
 
       expect_assigns(docker_images: Array)
       expect_assigns(execution_environment: ExecutionEnvironment)
-      expect_redirect
+      expect_redirect(:execution_environment)
     end
 
     context 'with an invalid execution environment' do
diff --git a/spec/controllers/exercises_controller_spec.rb b/spec/controllers/exercises_controller_spec.rb
index c6b492e3..d38aac2a 100644
--- a/spec/controllers/exercises_controller_spec.rb
+++ b/spec/controllers/exercises_controller_spec.rb
@@ -22,7 +22,7 @@ describe ExercisesController do
         expect(Exercise.last.token).not_to eq(exercise.token)
       end
 
-      expect_redirect
+      expect_redirect(Exercise.last)
     end
 
     context 'when saving fails' do
@@ -51,7 +51,7 @@ describe ExercisesController do
         expect { request.call }.to change(Exercise, :count).by(1)
       end
 
-      expect_redirect
+      expect_redirect(Exercise.last)
     end
 
     context 'when including a file' do
@@ -254,7 +254,7 @@ describe ExercisesController do
       before(:each) { put :update, exercise: exercise_attributes, id: exercise.id }
 
       expect_assigns(exercise: Exercise)
-      expect_redirect
+      expect_redirect(:exercise)
     end
 
     context 'with an invalid exercise' do
diff --git a/spec/controllers/file_types_controller_spec.rb b/spec/controllers/file_types_controller_spec.rb
index fab736bf..037e5ae5 100644
--- a/spec/controllers/file_types_controller_spec.rb
+++ b/spec/controllers/file_types_controller_spec.rb
@@ -17,7 +17,7 @@ describe FileTypesController do
         expect { request.call }.to change(FileType, :count).by(1)
       end
 
-      expect_redirect
+      expect_redirect(FileType.last)
     end
 
     context 'with an invalid file type' do
@@ -84,7 +84,7 @@ describe FileTypesController do
 
       expect_assigns(editor_modes: Array)
       expect_assigns(file_type: FileType)
-      expect_redirect
+      expect_redirect(:file_type)
     end
 
     context 'with an invalid file type' do
diff --git a/spec/controllers/hints_controller_spec.rb b/spec/controllers/hints_controller_spec.rb
index 51f3da2b..916e5150 100644
--- a/spec/controllers/hints_controller_spec.rb
+++ b/spec/controllers/hints_controller_spec.rb
@@ -18,7 +18,7 @@ describe HintsController do
         expect { request.call }.to change(Hint, :count).by(1)
       end
 
-      expect_redirect
+      expect_redirect(Hint.last)
     end
 
     context 'with an invalid hint' do
@@ -42,7 +42,7 @@ describe HintsController do
       expect { delete :destroy, execution_environment_id: execution_environment.id, id: hint.id }.to change(Hint, :count).by(-1)
     end
 
-    expect_redirect
+    expect_redirect { execution_environment_hints_path(execution_environment) }
   end
 
   describe 'GET #edit' do
@@ -88,7 +88,7 @@ describe HintsController do
 
       expect_assigns(execution_environment: :execution_environment)
       expect_assigns(hint: Hint)
-      expect_redirect
+      expect_redirect { hint }
     end
 
     context 'with an invalid hint' do
diff --git a/spec/controllers/internal_users_controller_spec.rb b/spec/controllers/internal_users_controller_spec.rb
index a2f5a6c0..ed7647da 100644
--- a/spec/controllers/internal_users_controller_spec.rb
+++ b/spec/controllers/internal_users_controller_spec.rb
@@ -15,7 +15,7 @@ describe InternalUsersController do
     context 'without a valid activation token' do
       before(:each) { get :activate, id: user.id }
 
-      expect_redirect
+      expect_redirect(:root)
     end
 
     context 'with an already activated user' do
@@ -24,7 +24,7 @@ describe InternalUsersController do
         get :activate, id: user.id, token: user.activation_token
       end
 
-      expect_redirect
+      expect_redirect(:root)
     end
 
     context 'with valid preconditions' do
@@ -49,7 +49,7 @@ describe InternalUsersController do
     context 'without a valid activation token' do
       before(:each) { put :activate, id: user.id }
 
-      expect_redirect
+      expect_redirect(:root)
     end
 
     context 'with an already activated user' do
@@ -58,7 +58,7 @@ describe InternalUsersController do
         put :activate, id: user.id, internal_user: {activation_token: user.activation_token, password: password, password_confirmation: password}
       end
 
-      expect_redirect
+      expect_redirect(:root)
     end
 
     context 'without a password' do
@@ -95,7 +95,7 @@ describe InternalUsersController do
       end
 
       expect_flash_message(:notice, :'internal_users.activate.success')
-      expect_redirect
+      expect_redirect(:sign_in)
     end
   end
 
@@ -125,7 +125,7 @@ describe InternalUsersController do
         request.call
       end
 
-      expect_redirect
+      expect_redirect(InternalUser.last)
     end
 
     context 'with an invalid internal user' do
@@ -234,7 +234,7 @@ describe InternalUsersController do
     context 'without a valid password reset token' do
       before(:each) { get :reset_password, id: user.id }
 
-      expect_redirect
+      expect_redirect(:root)
     end
 
     context 'with a valid password reset token' do
@@ -272,7 +272,7 @@ describe InternalUsersController do
           expect(InternalUser.authenticate(user.email, password)).to eq(user)
         end
 
-        expect_redirect { Rails.application.routes.url_helpers.send(:sign_in_path) }
+        expect_redirect(:sign_in)
       end
 
       context 'without a matching password confirmation' do
@@ -305,7 +305,7 @@ describe InternalUsersController do
       before(:each) { put :update, internal_user: FactoryGirl.attributes_for(:teacher), id: users.first.id }
 
       expect_assigns(user: InternalUser)
-      expect_redirect
+      expect_redirect { user }
     end
 
     context 'with an invalid internal user' do
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index 7f85f03d..d8c12eb5 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -15,7 +15,7 @@ describe SessionsController do
       end
 
       expect_flash_message(:notice, :'sessions.create.success')
-      expect_redirect
+      expect_redirect(:root)
     end
 
     context 'with invalid credentials' do
@@ -206,7 +206,7 @@ describe SessionsController do
         get :new
       end
 
-      expect_redirect
+      expect_redirect(:root)
     end
   end
 end
diff --git a/spec/controllers/teams_controller_spec.rb b/spec/controllers/teams_controller_spec.rb
index af31434a..78dfc60d 100644
--- a/spec/controllers/teams_controller_spec.rb
+++ b/spec/controllers/teams_controller_spec.rb
@@ -16,7 +16,7 @@ describe TeamsController do
         expect { request.call }.to change(Team, :count).by(1)
       end
 
-      expect_redirect
+      expect_redirect(Team.last)
     end
 
     context 'with an invalid team' do
@@ -79,7 +79,7 @@ describe TeamsController do
       before(:each) { put :update, team: FactoryGirl.attributes_for(:team), id: team.id }
 
       expect_assigns(team: Team)
-      expect_redirect
+      expect_redirect(:team)
     end
 
     context 'with an invalid team' do