diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-01 18:46:22 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-01 18:46:22 -0400 |
| commit | 2b79a033262dfe610eb22b7f6b3614db9cb134b1 (patch) | |
| tree | 2bb77aa81022e7c01cccfb67127c7acd2fbb65aa /test | |
| parent | f08191c3966851b19edc949d7819cc58190037d7 (diff) | |
| parent | e6b160bd81e51e0bd88e5c2563a06ea5f0d64620 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'test')
| -rw-r--r-- | test/controllers/tournaments_controller_test.rb | 4 | ||||
| -rw-r--r-- | test/fixtures/tournaments.yml | 2 |
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 |