From e08e007a6c50e1959a29a9d18dec8c52146a233c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Mon, 28 Apr 2014 09:33:06 -0400
Subject: run ./generate.sh
---
test/controllers/games_controller_test.rb | 4 ++--
test/controllers/tournaments_controller_test.rb | 4 ++--
test/fixtures/games.yml | 2 --
test/fixtures/tournaments.yml | 2 --
4 files changed, 4 insertions(+), 8 deletions(-)
(limited to 'test')
diff --git a/test/controllers/games_controller_test.rb b/test/controllers/games_controller_test.rb
index b86fe7a..1a457ba 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: { 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, parent_id: @game.parent_id, sampling_method: @game.sampling_method, scoring_method: @game.scoring_method }
+ 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, parent_id: @game.parent_id, scoring_method: @game.scoring_method }
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: { 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, parent_id: @game.parent_id, sampling_method: @game.sampling_method, scoring_method: @game.scoring_method }
+ 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, parent_id: @game.parent_id, scoring_method: @game.scoring_method }
assert_redirected_to game_path(assigns(:game))
end
diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb
index 5639150..7ef5590 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, sampling_method: @tournament.sampling_method, scoring_method: @tournament.scoring_method, 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, scoring_method: @tournament.scoring_method, 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, sampling_method: @tournament.sampling_method, scoring_method: @tournament.scoring_method, 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, scoring_method: @tournament.scoring_method, status: @tournament.status }
assert_redirected_to tournament_path(assigns(:tournament))
end
diff --git a/test/fixtures/games.yml b/test/fixtures/games.yml
index f6d8a2e..bdb9cb5 100644
--- a/test/fixtures/games.yml
+++ b/test/fixtures/games.yml
@@ -7,7 +7,6 @@ one:
max_players_per_team: 1
min_teams_per_match: 1
max_teams_per_match: 1
- sampling_method: MyString
scoring_method: MyString
two:
@@ -17,5 +16,4 @@ two:
max_players_per_team: 1
min_teams_per_match: 1
max_teams_per_match: 1
- sampling_method: MyString
scoring_method: MyString
diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml
index d975b1d..4691b8a 100644
--- a/test/fixtures/tournaments.yml
+++ b/test/fixtures/tournaments.yml
@@ -8,7 +8,6 @@ one:
max_players_per_team: 1
min_teams_per_match: 1
max_teams_per_match: 1
- sampling_method: MyString
scoring_method: MyString
two:
@@ -19,5 +18,4 @@ two:
max_players_per_team: 1
min_teams_per_match: 1
max_teams_per_match: 1
- sampling_method: MyString
scoring_method: MyString
--
cgit v1.2.3-54-g00ecf