summaryrefslogtreecommitdiff
path: root/test/controllers/matches_controller_test.rb
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-04-22 11:46:11 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-04-22 11:46:11 -0400
commitdb45b2441bd57a5e640b529ef6239c98a3030fe2 (patch)
treebcffce81e433821f6ddd9a6588b40ee1d5f84592 /test/controllers/matches_controller_test.rb
parent4aeaf0e41518695c3c6ba3b09025516f67b06a11 (diff)
parent474a048ae4a4fae86e7fde93745f0ea79c7ed717 (diff)
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'test/controllers/matches_controller_test.rb')
-rw-r--r--test/controllers/matches_controller_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/controllers/matches_controller_test.rb b/test/controllers/matches_controller_test.rb
index aca7008..033704e 100644
--- a/test/controllers/matches_controller_test.rb
+++ b/test/controllers/matches_controller_test.rb
@@ -18,7 +18,7 @@ class MatchesControllerTest < ActionController::TestCase
test "should create match" do
assert_difference('Match.count') do
- post :create, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_id: @match.tournament_id, winner_id: @match.winner_id }
+ post :create, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_stage_id: @match.tournament_stage_id, winner_id: @match.winner_id }
end
assert_redirected_to match_path(assigns(:match))
@@ -35,7 +35,7 @@ class MatchesControllerTest < ActionController::TestCase
end
test "should update match" do
- patch :update, id: @match, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_id: @match.tournament_id, winner_id: @match.winner_id }
+ patch :update, id: @match, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_stage_id: @match.tournament_stage_id, winner_id: @match.winner_id }
assert_redirected_to match_path(assigns(:match))
end