Upgraded to Rails 5.1.1

test/controllers/tournaments_controller_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class TournamentsControllerTest < ActionController::TestCase
-include Devise::TestHelpers
+  include Devise::Test::ControllerHelpers
 
   setup do
      @tournament = Tournament.find(1)
@@ -12,11 +12,11 @@ include Devise::TestHelpers
   end
 
   def post_update
-    patch :update, id: 1, tournament: {name: @tournament.name}
+    patch :update, params: { id: 1, tournament: {name: @tournament.name} }
   end
  
   def get_edit
-    get :edit, id: 1
+    get :edit, params: { id: 1 }
   end
 
   def sign_in_owner
@@ -44,7 +44,7 @@ include Devise::TestHelpers
   end
 
   def destroy
-    delete :destroy, id: 1
+    delete :destroy, params: { id: 1 }
   end
 
   def no_matches
@@ -57,91 +57,91 @@ include Devise::TestHelpers
 
   test "logged in tournament owner can generate matches" do
     sign_in_owner
-    get :generate_matches, id: 1
+    get :generate_matches, params: { id: 1 }
     success
   end
 
   test "logged in non tournament owner cannot generate matches" do
     sign_in_non_owner
-    get :generate_matches, id: 1
+    get :generate_matches, params: { id: 1 }
     redirect
   end
   
   test "logged in school delegate cannot generate matches" do
     sign_in_school_delegate
-    get :generate_matches, id: 1
+    get :generate_matches, params: { id: 1 }
     redirect
   end
 
   test "logged in tournament owner can create custom weights" do
     sign_in_owner
-    get :create_custom_weights, id: 1, customValue: 'hs' 
+    get :create_custom_weights, params: { id: 1, customValue: 'hs' } 
     assert_redirected_to '/tournaments/1'
   end
 
   test "logged in non tournament owner cannot create custom weights" do
     sign_in_non_owner
-    get :create_custom_weights, id: 1, customValue: 'hs' 
+    get :create_custom_weights, params: { id: 1, customValue: 'hs' }
     redirect
   end
   
   test "logged in school delegate cannot create custom weights" do
     sign_in_school_delegate
-    get :create_custom_weights, id: 1, customValue: 'hs' 
+    get :create_custom_weights, params: { id: 1, customValue: 'hs' } 
     redirect
   end
 
 
   test "logged in tournament owner can access weigh_ins" do
     sign_in_owner
-    get :weigh_in, id: 1
+    get :weigh_in, params: { id: 1 }
     success
   end
 
   test "logged in non tournament owner cannot access weigh_ins" do
     sign_in_non_owner
-    get :weigh_in, id: 1
+    get :weigh_in, params: { id: 1 }
     redirect    
   end
   
   test "logged in school delegate cannot access weigh_ins" do
     sign_in_school_delegate
-    get :weigh_in, id: 1
+    get :weigh_in, params: { id: 1 }
     redirect    
   end
 
   test "logged in tournament owner can access weigh_in_weight" do
     sign_in_owner
-    get :weigh_in, id: 1, weight: 1
+    get :weigh_in, params: { id: 1, weight: 1 }
     success
   end
 
   test "logged in non tournament owner cannot access weigh_in_weight" do
     sign_in_non_owner
-    get :weigh_in_weight, id: 1, weight: 1
+    get :weigh_in_weight, params: { id: 1, weight: 1 }
     redirect    
   end
   
   test "logged in school delegate cannot access weigh_in_weight" do
     sign_in_school_delegate
-    get :weigh_in_weight, id: 1, weight: 1
+    get :weigh_in_weight, params: { id: 1, weight: 1 }
     redirect    
   end
   
   test "logged in tournament owner can access post weigh_in_weight" do
     sign_in_owner
-    post :weigh_in, id: 1, weight: 1, wrestler: @wrestlers
+    post :weigh_in, params: { id: 1, weight: 1, wrestler: @wrestlers }
   end
 
   test "logged in non tournament owner cannot access post weigh_in_weight" do
     sign_in_non_owner
-    post :weigh_in_weight, id: 1, weight: 1, wrestler: @wrestlers
+    post :weigh_in_weight, params: { id: 1, weight: 1, wrestler: @wrestlers }
     redirect    
   end
   
   test "logged in school delegate cannot access post weigh_in_weight" do
     sign_in_school_delegate
-    post :weigh_in_weight, id: 1, weight: 1, wrestler: @wrestlers
+    post :weigh_in_weight, params: { id: 1, weight: 1, wrestler: @wrestlers }
     redirect    
   end
 
@@ -216,38 +216,38 @@ include Devise::TestHelpers
   test "redirect up_matches if no matches" do
     sign_in_owner
     wipe
-    get :up_matches, id: 1
+    get :up_matches, params: { id: 1 }
     no_matches
   end
   
   test "redirect bracket if no matches" do
     sign_in_owner
     wipe
-    get :bracket, id: 1, weight: 1
+    get :bracket, params: { id: 1, weight: 1 }
     no_matches
   end
   
   test "logged in tournament delegate can generate matches" do
     sign_in_delegate
-    get :generate_matches, id: 1
+    get :generate_matches, params: { id: 1 }
     success
   end
 
   test "logged in tournament delegate can create custom weights" do
     sign_in_delegate
-    get :create_custom_weights, id: 1, customValue: 'hs' 
+    get :create_custom_weights, params: { id: 1, customValue: 'hs' }
     assert_redirected_to '/tournaments/1'
   end
 
   test "logged in tournament delegate can access weigh_ins" do
     sign_in_delegate
-    get :weigh_in, id: 1
+    get :weigh_in, params: { id: 1 }
     success
   end
 
   test "logged in tournament delegate can access weigh_in_weight" do
     sign_in_delegate
-    get :weigh_in, id: 1, weight: 1
+    get :weigh_in, params: { id: 1, weight: 1 }
     success
   end
   
@@ -259,7 +259,7 @@ include Devise::TestHelpers
   
   test "logged in tournament delegate can access post weigh_in_weight" do
     sign_in_delegate
-    post :weigh_in, id: 1, weight: 1, wrestler: @wrestlers
+    post :weigh_in, params: { id: 1, weight: 1, wrestler: @wrestlers }
   end
   
   test "logged in tournament delegate should post update tournament" do
@@ -277,49 +277,49 @@ include Devise::TestHelpers
   
   test 'logged in tournament owner can delegate a user' do
     sign_in_owner
-    get :delegate, id: 1
+    get :delegate, params: { id: 1 }
     success
   end
   
   test 'logged in tournament delegate cannot delegate a user' do
     sign_in_delegate
-    get :delegate, id: 1
+    get :delegate, params: { id: 1 }
     redirect
   end
   
   test 'logged in tournament owner can delegate a school user' do
     sign_in_owner
-    get :school_delegate, id: 1
+    get :school_delegate, params: { id: 1 }
     success
   end
   
   test 'logged in tournament delegate can delegate a school user' do
     sign_in_delegate
-    get :school_delegate, id: 1
+    get :school_delegate, params: { id: 1 }
     success
   end
   
   test 'logged in tournament owner can delete a school delegate' do
     sign_in_owner
-    patch :remove_school_delegate, id: 1, delegate: SchoolDelegate.find(1)
+    patch :remove_school_delegate, params: { id: 1, delegate: SchoolDelegate.find(1) }
     assert_redirected_to "/tournaments/#{@tournament.id}/school_delegate"
   end
   
   test 'logged in tournament delegate can delete a school delegate' do
     sign_in_delegate
-    patch :remove_school_delegate, id: 1, delegate: SchoolDelegate.find(1)
+    patch :remove_school_delegate, params: { id: 1, delegate: SchoolDelegate.find(1) }
     assert_redirected_to "/tournaments/#{@tournament.id}/school_delegate"
   end
   
   test 'logged in tournament owner can delete a delegate' do
     sign_in_owner
-    patch :remove_delegate, id: 1, delegate: TournamentDelegate.find(1)
+    patch :remove_delegate, params: { id: 1, delegate: TournamentDelegate.find(1) }
     assert_redirected_to "/tournaments/#{@tournament.id}/delegate"
   end
   
   test 'logged in tournament delegate cannot delete a delegate' do
     sign_in_delegate
-    patch :remove_delegate, id: 1, delegate: TournamentDelegate.find(1)
+    patch :remove_delegate, params: { id: 1, delegate: TournamentDelegate.find(1) }
     redirect
   end
   
@@ -328,37 +328,37 @@ include Devise::TestHelpers
   
    test 'logged in tournament delegate can adjust team points' do
     sign_in_delegate
-    get :teampointadjust, id: 1
+    get :teampointadjust, params: { id: 1 }
     success
   end
   
   test 'logged in tournament owner can adjust team points' do
     sign_in_owner
-    get :teampointadjust, id: 1
+    get :teampointadjust, params: { id: 1 }
     success
   end
   
   test 'logged in tournament delegate cannot adjust team points' do
     sign_in_school_delegate
-    get :teampointadjust, id: 1
+    get :teampointadjust, params: { id: 1 }
     redirect
   end
   
   test 'logged in tournament owner can delete team point adjust' do
     sign_in_owner
-    post :remove_teampointadjust, id: 1, teampointadjust: Teampointadjust.find(1)
+    post :remove_teampointadjust, params: { id: 1, teampointadjust: Teampointadjust.find(1) }
     assert_redirected_to "/tournaments/#{@tournament.id}/teampointadjust"
   end
   
   test 'logged in tournament delegate can team point adjust' do
     sign_in_delegate
-    post :remove_teampointadjust, id: 1, teampointadjust: Teampointadjust.find(1)
+    post :remove_teampointadjust, params: { id: 1, teampointadjust: Teampointadjust.find(1) }
     assert_redirected_to "/tournaments/#{@tournament.id}/teampointadjust"
   end
   
   test 'logged in school delegate cannot delete team point adjust' do
     sign_in_school_delegate
-    post :remove_teampointadjust, id: 1, teampointadjust: Teampointadjust.find(1)
+    post :remove_teampointadjust, params: { id: 1, teampointadjust: Teampointadjust.find(1) }
     redirect
   end