diff options
author | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-25 17:56:25 -0400 |
---|---|---|
committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-25 17:56:25 -0400 |
commit | d8acc6785ee41a2628cd0d59d91916b2f087290b (patch) | |
tree | bdc6343b90c3ce6015f8c81bf06a250cb9580133 /test/controllers/matches_controller_test.rb | |
parent | 53b4f8028fc987b0cf26a7a073fec7064b4b6d8a (diff) | |
parent | 433fc302fe2943e89a36657affea39d578475d20 (diff) |
Adding match status after solving conflicts
Diffstat (limited to 'test/controllers/matches_controller_test.rb')
-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 51b7f37..c3cc7a4 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, winner_id: @match.winner_id } + post :create, match: { name: @match.name, status: @match.status, 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, winner_id: @match.winner_id } + patch :update, id: @match, match: { name: @match.name, status: @match.status, tournament_id: @match.tournament_id, winner_id: @match.winner_id } assert_redirected_to match_path(assigns(:match)) end |