diff options
author | AndrewMurrell <amurrel@purdue.edu> | 2014-03-07 00:41:47 -0500 |
---|---|---|
committer | AndrewMurrell <amurrel@purdue.edu> | 2014-03-07 00:41:47 -0500 |
commit | fd213819fa004209fc466b19ee65d83b1f918068 (patch) | |
tree | ecfe47daa486da7d878207ac6a799b6fab79deab /test/controllers | |
parent | 5ca9bd493d0348d56a3a8ce56923a72230515fe0 (diff) | |
parent | 8fc6b48caccdb8fbfe04e41282444e0b916883b3 (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'test/controllers')
-rw-r--r-- | test/controllers/matches_controller_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/controllers/matches_controller_test.rb b/test/controllers/matches_controller_test.rb index 50675d8..51b7f37 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, tournament_id: @match.tournament_id } + post :create, match: { name: @match.name, tournament_id: @match.tournament_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, tournament_id: @match.tournament_id } + patch :update, id: @match, match: { name: @match.name, tournament_id: @match.tournament_id, winner_id: @match.winner_id } assert_redirected_to match_path(assigns(:match)) end |