Merge branch 'clean4'

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/assets/stylesheets/static.css.scss
	app/controllers/sessions_controller.rb
	app/controllers/static_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/helpers/sessions_helper.rb
	app/models/game.rb
	app/models/user.rb
	app/views/games/index.html.erb
	app/views/tournaments/index.html.erb
	app/views/tournaments/new.html.erb
	app/views/users/_form.html.erb
	app/views/users/index.html.erb
	app/views/users/index.json.jbuilder
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	app/views/users/show.json.jbuilder
	config/routes.rb
	generate.sh

1 files changed, 49 insertions, 0 deletions

diff --git a/test/controllers/teams_controller_test.rb b/test/controllers/teams_controller_test.rb
new file mode 100644
index 0000000..8bf60be
--- /dev/null
+++ b/test/controllers/teams_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class TeamsControllerTest < ActionController::TestCase
+  setup do
+    @team = teams(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:teams)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create team" do
+    assert_difference('Team.count') do
+      post :create, team: {  }
+    end
+
+    assert_redirected_to team_path(assigns(:team))
+  end
+
+  test "should show team" do
+    get :show, id: @team
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @team
+    assert_response :success
+  end
+
+  test "should update team" do
+    patch :update, id: @team, team: {  }
+    assert_redirected_to team_path(assigns(:team))
+  end
+
+  test "should destroy team" do
+    assert_difference('Team.count', -1) do
+      delete :destroy, id: @team
+    end
+
+    assert_redirected_to teams_path
+  end
+end