summaryrefslogtreecommitdiff
path: root/test/controllers/tournaments_controller_test.rb
diff options
context:
space:
mode:
authorTomer Kimia <tkimia@purdue.edu>2014-04-01 18:52:51 -0400
committerTomer Kimia <tkimia@purdue.edu>2014-04-01 18:52:51 -0400
commitf3125c3087ac7d47d1698b328c76620f6a5464e8 (patch)
tree0317eb2937326d889e1b23f31dba9c756e3f4703 /test/controllers/tournaments_controller_test.rb
parentaa6e8f12a24e33d88a5751cee5e93bf4a038e2ef (diff)
parente6b160bd81e51e0bd88e5c2563a06ea5f0d64620 (diff)
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'test/controllers/tournaments_controller_test.rb')
-rw-r--r--test/controllers/tournaments_controller_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb
index d5ab2af..0c1ff60 100644
--- a/test/controllers/tournaments_controller_test.rb
+++ b/test/controllers/tournaments_controller_test.rb
@@ -18,7 +18,7 @@ class TournamentsControllerTest < ActionController::TestCase
test "should create tournament" do
assert_difference('Tournament.count') do
- post :create, tournament: { game_id: @tournament.game_id, max_players_per_team: @tournament.max_players_per_team, max_teams_per_match: @tournament.max_teams_per_match, min_players_per_team: @tournament.min_players_per_team, min_teams_per_match: @tournament.min_teams_per_match, name: @tournament.name, randomized_teams: @tournament.randomized_teams, set_rounds: @tournament.set_rounds, status: @tournament.status }
+ post :create, tournament: { game_id: @tournament.game_id, name: @tournament.name, randomized_teams: @tournament.randomized_teams, status: @tournament.status }
end
assert_redirected_to tournament_path(assigns(:tournament))
@@ -35,7 +35,7 @@ class TournamentsControllerTest < ActionController::TestCase
end
test "should update tournament" do
- patch :update, id: @tournament, tournament: { game_id: @tournament.game_id, max_players_per_team: @tournament.max_players_per_team, max_teams_per_match: @tournament.max_teams_per_match, min_players_per_team: @tournament.min_players_per_team, min_teams_per_match: @tournament.min_teams_per_match, name: @tournament.name, randomized_teams: @tournament.randomized_teams, set_rounds: @tournament.set_rounds, status: @tournament.status }
+ patch :update, id: @tournament, tournament: { game_id: @tournament.game_id, name: @tournament.name, randomized_teams: @tournament.randomized_teams, status: @tournament.status }
assert_redirected_to tournament_path(assigns(:tournament))
end