diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-07 00:25:38 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-07 00:25:38 -0500 |
commit | c1f714a479eb7ca9e9125e283361a471dd928278 (patch) | |
tree | 5d4a35af99b629d83afe86c81de6ef46669ef238 /test | |
parent | fff1ca96f63833d7d08ca3f95fb13284e517b69d (diff) |
Merge branch 'clean'
Conflicts:
app/models/match.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
db/migrate/20140304043618_create_servers.rb
db/migrate/20140304043622_create_matches.rb
db/migrate/20140304043624_create_teams.rb
db/migrate/20140304043626_create_alerts.rb
db/migrate/20140304043629_create_pms.rb
db/migrate/20140304043633_create_users.rb
db/migrate/20140304043637_create_server_settings.rb
db/migrate/20140304043700_create_tournament_options.rb
db/migrate/20140307045916_create_servers.rb
db/migrate/20140307045922_create_matches.rb
db/migrate/20140307045927_create_teams.rb
db/migrate/20140307045934_create_alerts.rb
db/migrate/20140307045941_create_pms.rb
db/migrate/20140307050001_create_users.rb
db/migrate/20140307050016_create_server_settings.rb
db/migrate/20140307050023_create_tournament_options.rb
db/migrate/20140307051752_create_servers.rb
db/migrate/20140307051756_create_tournaments.rb
db/migrate/20140307051800_create_matches.rb
db/migrate/20140307051804_create_teams.rb
db/migrate/20140307051808_create_alerts.rb
db/migrate/20140307051812_create_pms.rb
db/migrate/20140307051816_create_games.rb
db/migrate/20140307051820_create_users.rb
db/migrate/20140307051824_create_game_attributes.rb
db/migrate/20140307051827_create_server_settings.rb
db/migrate/20140307051831_create_user_team_pairs.rb
db/migrate/20140307051835_create_team_match_pairs.rb
db/migrate/20140307051853_add_index_to_users_email.rb
db/migrate/20140307051857_add_index_to_users_user_name.rb
db/migrate/20140307051901_add_password_digest_to_users.rb
db/migrate/20140307051904_add_remember_token_to_users.rb
db/migrate/20140307051908_create_tournament_options.rb
db/schema.rb
generate.sh
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 50675d8..51b7f37 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, tournament_id: @match.tournament_id } + post :create, match: { name: @match.name, 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, tournament_id: @match.tournament_id } + patch :update, id: @match, match: { name: @match.name, 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 089fc65..956229c 100644 --- a/test/fixtures/matches.yml +++ b/test/fixtures/matches.yml @@ -3,7 +3,9 @@ one: tournament_id: name: MyString + winner_id: two: tournament_id: name: MyString + winner_id: |