Merge branch 'clean'

Conflicts:
	app/controllers/tournaments_controller.rb
	app/views/teams/show.html.erb
	app/views/tournaments/index.html.erb
	config/routes.rb

1 files changed, 2 insertions, 2 deletions

diff --git a/test/controllers/teams_controller_test.rb b/test/controllers/teams_controller_test.rb
index 8bf60be..52f7c17 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: {  }
+      post :create, team: { match_id: @team.match_id }
     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: {  }
+    patch :update, id: @team, team: { match_id: @team.match_id }
     assert_redirected_to team_path(assigns(:team))
   end