diff options
| author | shumakl <shumakl@purdue.edu> | 2014-04-03 12:32:48 -0400 |
|---|---|---|
| committer | shumakl <shumakl@purdue.edu> | 2014-04-03 12:32:48 -0400 |
| commit | 4015a27f66eafee66137bc27a76843bd48139772 (patch) | |
| tree | f2e4347606fa9bdec73ede85d562a7b891c85df2 /test/controllers/tournaments_controller_test.rb | |
| parent | 8d5325cd6019b784ba2da66d19c41daaadbc19e0 (diff) | |
| parent | 8e3e46b7951120f1ec34949d607a7672ad03f820 (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/alerts_controller.rb
app/controllers/application_controller.rb
app/controllers/matches_controller.rb
app/controllers/servers_controller.rb
app/controllers/sessions_controller.rb
app/controllers/tournaments_controller.rb
app/controllers/users_controller.rb
app/models/match.rb
app/models/team.rb
app/models/tournament.rb
app/views/sessions/_form.html.erb
app/views/sessions/index.html.erb
app/views/sessions/index.json.jbuilder
app/views/sessions/show.html.erb
app/views/sessions/show.json.jbuilder
app/views/tournaments/index.html.erb
config/routes.rb
generate.sh
Diffstat (limited to 'test/controllers/tournaments_controller_test.rb')
| -rw-r--r-- | test/controllers/tournaments_controller_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb index 0c1ff60..d5ab2af 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, name: @tournament.name, randomized_teams: @tournament.randomized_teams, status: @tournament.status } + 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 } 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, name: @tournament.name, randomized_teams: @tournament.randomized_teams, status: @tournament.status } + 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 } assert_redirected_to tournament_path(assigns(:tournament)) end |