diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:41:29 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:41:29 -0500 |
commit | d72452a5965c0df32a13053ae86bcd529fc0fc9e (patch) | |
tree | fb03041e6cf5d8b56d308481492821af8e663028 /test/controllers | |
parent | 50371ba04b52f74bfc2ceb05a429e072ad4848bb (diff) | |
parent | f5d36fc67d1994b7cc1ce02e7be2767ffcb47857 (diff) |
Merge branch 'master' of github.com:LukeShu/leaguer
Conflicts:
app/controllers/tournaments_controller.rb
app/models/tournament.rb
app/views/tournaments/_selected.html.erb
app/views/tournaments/new.html.erb
db/migrate/20140306024707_create_servers.rb
db/migrate/20140306024711_create_matches.rb
db/migrate/20140306024713_create_teams.rb
db/migrate/20140306024715_create_alerts.rb
db/migrate/20140306024718_create_pms.rb
db/migrate/20140306024722_create_users.rb
db/migrate/20140306024724_create_sessions.rb
db/migrate/20140306024729_create_server_settings.rb
db/migrate/20140306024731_create_user_team_pairs.rb
db/migrate/20140306024733_create_team_match_pairs.rb
db/migrate/20140306024735_create_tournament_options.rb
db/migrate/20140306024744_add_hidden_attrs_to_user.rb
db/migrate/20140306202154_create_servers.rb
db/migrate/20140306202156_create_tournaments.rb
db/migrate/20140306202158_create_matches.rb
db/migrate/20140306202200_create_teams.rb
db/migrate/20140306202202_create_alerts.rb
db/migrate/20140306202204_create_pms.rb
db/migrate/20140306202207_create_games.rb
db/migrate/20140306202209_create_users.rb
db/migrate/20140306202211_create_sessions.rb
db/migrate/20140306202213_create_game_attributes.rb
db/migrate/20140306202215_create_server_settings.rb
db/migrate/20140306202217_create_tournament_options.rb
db/migrate/20140306202219_create_user_team_pairs.rb
db/migrate/20140306202224_create_team_match_pairs.rb
db/migrate/20140306202232_add_hidden_attrs_to_user.rb
db/migrate/20140306222309_create_servers.rb
db/migrate/20140306222320_create_matches.rb
db/migrate/20140306222325_create_teams.rb
db/migrate/20140306222330_create_alerts.rb
db/migrate/20140306222336_create_pms.rb
db/migrate/20140306222347_create_users.rb
db/migrate/20140306222352_create_sessions.rb
db/migrate/20140306222357_create_server_settings.rb
db/migrate/20140306222402_create_tournament_options.rb
db/migrate/20140306222422_create_user_team_pairs.rb
db/migrate/20140306222427_create_team_match_pairs.rb
db/migrate/20140306222447_add_hidden_attrs_to_user.rb
db/schema.rb
generate.sh
Diffstat (limited to 'test/controllers')
-rw-r--r-- | test/controllers/games_controller_test.rb | 4 | ||||
-rw-r--r-- | test/controllers/teams_controller_test.rb | 4 | ||||
-rw-r--r-- | test/controllers/tournaments_controller_test.rb | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/test/controllers/games_controller_test.rb b/test/controllers/games_controller_test.rb index 95c3145..b93feac 100644 --- a/test/controllers/games_controller_test.rb +++ b/test/controllers/games_controller_test.rb @@ -18,7 +18,7 @@ class GamesControllerTest < ActionController::TestCase test "should create game" do assert_difference('Game.count') do - post :create, game: { name: @game.name, players_per_team: @game.players_per_team, randomized_teams: @game.randomized_teams, set_rounds: @game.set_rounds, teams_per_match: @game.teams_per_match } + post :create, game: { max_players_per_team: @game.max_players_per_team, max_teams_per_match: @game.max_teams_per_match, min_players_per_team: @game.min_players_per_team, min_teams_per_match: @game.min_teams_per_match, name: @game.name, randomized_teams: @game.randomized_teams, set_rounds: @game.set_rounds } end assert_redirected_to game_path(assigns(:game)) @@ -35,7 +35,7 @@ class GamesControllerTest < ActionController::TestCase end test "should update game" do - patch :update, id: @game, game: { name: @game.name, players_per_team: @game.players_per_team, randomized_teams: @game.randomized_teams, set_rounds: @game.set_rounds, teams_per_match: @game.teams_per_match } + patch :update, id: @game, game: { max_players_per_team: @game.max_players_per_team, max_teams_per_match: @game.max_teams_per_match, min_players_per_team: @game.min_players_per_team, min_teams_per_match: @game.min_teams_per_match, name: @game.name, randomized_teams: @game.randomized_teams, set_rounds: @game.set_rounds } assert_redirected_to game_path(assigns(:game)) end diff --git a/test/controllers/teams_controller_test.rb b/test/controllers/teams_controller_test.rb index 8bf60be..52f7c17 100644 --- a/test/controllers/teams_controller_test.rb +++ b/test/controllers/teams_controller_test.rb @@ -18,7 +18,7 @@ class TeamsControllerTest < ActionController::TestCase test "should create team" do assert_difference('Team.count') do - post :create, team: { } + post :create, team: { match_id: @team.match_id } end assert_redirected_to team_path(assigns(:team)) @@ -35,7 +35,7 @@ class TeamsControllerTest < ActionController::TestCase end test "should update team" do - patch :update, id: @team, team: { } + patch :update, id: @team, team: { match_id: @team.match_id } assert_redirected_to team_path(assigns(:team)) end diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb index bdbbfac..02e578a 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 } + 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, 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 } + 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, randomized_teams: @tournament.randomized_teams, set_rounds: @tournament.set_rounds, status: @tournament.status } assert_redirected_to tournament_path(assigns(:tournament)) end |