summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-04-01 18:01:53 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-04-01 18:01:53 -0400
commita2de6b22a720671b796c88c694db905665fda142 (patch)
tree5711cae8901997cf51a34a5368e25a7c4fd92d08 /test
parent0f2b05889cba090e4824f62965ee8d131da09973 (diff)
oops, removed ger
Diffstat (limited to 'test')
-rw-r--r--test/controllers/tournaments_controller_test.rb4
-rw-r--r--test/fixtures/tournaments.yml2
2 files changed, 2 insertions, 4 deletions
diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb
index 775288c..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, ger: @tournament.ger, name: @tournament.name, randomized_teams: @tournament.randomized_teams, 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, ger: @tournament.ger, name: @tournament.name, randomized_teams: @tournament.randomized_teams, 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
diff --git a/test/fixtures/tournaments.yml b/test/fixtures/tournaments.yml
index 25bb065..d5a4366 100644
--- a/test/fixtures/tournaments.yml
+++ b/test/fixtures/tournaments.yml
@@ -4,12 +4,10 @@ one:
name: MyString
game_id:
status: 1
- ger: MyString
randomized_teams: false
two:
name: MyString
game_id:
status: 1
- ger: MyString
randomized_teams: false