diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 15:56:06 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 15:56:06 -0400 |
| commit | 45c5d311492ef98ed702beaf043d289a705a5e0b (patch) | |
| tree | c0bea2e65d21127a1fd34a245b5bb7fc47123bb0 /test/controllers/teams_controller_test.rb | |
| parent | 9d226fcd27b6c2470edf718ad36a262348891470 (diff) | |
| parent | c927cd7c043d982f8ffb51c8a78288d88d825d82 (diff) | |
Merge branch 'clean2'
Conflicts:
app/models/team.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
Diffstat (limited to 'test/controllers/teams_controller_test.rb')
| -rw-r--r-- | test/controllers/teams_controller_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/controllers/teams_controller_test.rb b/test/controllers/teams_controller_test.rb index 52f7c17..8bf60be 100644 --- a/test/controllers/teams_controller_test.rb +++ b/test/controllers/teams_controller_test.rb @@ -18,7 +18,7 @@ class TeamsControllerTest < ActionController::TestCase test "should create team" do assert_difference('Team.count') do - post :create, team: { match_id: @team.match_id } + post :create, team: { } end assert_redirected_to team_path(assigns(:team)) @@ -35,7 +35,7 @@ class TeamsControllerTest < ActionController::TestCase end test "should update team" do - patch :update, id: @team, team: { match_id: @team.match_id } + patch :update, id: @team, team: { } assert_redirected_to team_path(assigns(:team)) end |