diff options
author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-07 04:18:09 -0400 |
---|---|---|
committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-07 04:18:09 -0400 |
commit | b5f430fd59f7140722cc7940356c1de1ddd6f4d4 (patch) | |
tree | 44f8d8f62cd3535a897a28b5a99e8dfb917dc995 /test | |
parent | 26738698ae3a26c98d81a03309c150c7e38e3488 (diff) | |
parent | c3af0f5b51dfe842ad9e4c5ea93e202e26e818ac (diff) |
Merge branch 'clean2'
Conflicts:
app/views/matches/index.html.erb
app/views/matches/show.html.erb
Diffstat (limited to 'test')
-rw-r--r-- | test/controllers/matches_controller_test.rb | 4 | ||||
-rw-r--r-- | test/fixtures/matches.yml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/controllers/matches_controller_test.rb b/test/controllers/matches_controller_test.rb index 8782b2c..aca7008 100644 --- a/test/controllers/matches_controller_test.rb +++ b/test/controllers/matches_controller_test.rb @@ -18,7 +18,7 @@ class MatchesControllerTest < ActionController::TestCase test "should create match" do assert_difference('Match.count') do - post :create, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, tournament_id: @match.tournament_id, winner_id: @match.winner_id } + post :create, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_id: @match.tournament_id, winner_id: @match.winner_id } end assert_redirected_to match_path(assigns(:match)) @@ -35,7 +35,7 @@ class MatchesControllerTest < ActionController::TestCase end test "should update match" do - patch :update, id: @match, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, tournament_id: @match.tournament_id, winner_id: @match.winner_id } + patch :update, id: @match, match: { name: @match.name, remote_id: @match.remote_id, status: @match.status, submitted_peer_evaluations: @match.submitted_peer_evaluations, tournament_id: @match.tournament_id, winner_id: @match.winner_id } assert_redirected_to match_path(assigns(:match)) end diff --git a/test/fixtures/matches.yml b/test/fixtures/matches.yml index 8e86062..f64a72e 100644 --- a/test/fixtures/matches.yml +++ b/test/fixtures/matches.yml @@ -6,6 +6,7 @@ one: name: MyString winner_id: remote_id: MyString + submitted_peer_evaluations: 1 two: status: 1 @@ -13,3 +14,4 @@ two: name: MyString winner_id: remote_id: MyString + submitted_peer_evaluations: 1 |