Merge branch 'clean2'

Conflicts:
	app/controllers/alerts_controller.rb
	app/controllers/application_controller.rb
	app/controllers/matches_controller.rb
	app/controllers/servers_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/models/match.rb
	app/models/team.rb
	app/models/tournament.rb
	app/views/sessions/_form.html.erb
	app/views/sessions/index.html.erb
	app/views/sessions/index.json.jbuilder
	app/views/sessions/show.html.erb
	app/views/sessions/show.json.jbuilder
	app/views/tournaments/index.html.erb
	config/routes.rb
	generate.sh

3 files changed, 53 insertions, 4 deletions

diff --git a/test/controllers/remote_usernames_controller_test.rb b/test/controllers/remote_usernames_controller_test.rb
new file mode 100644
index 0000000..ff6a91d
--- /dev/null
+++ b/test/controllers/remote_usernames_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class RemoteUsernamesControllerTest < ActionController::TestCase
+  setup do
+    @remote_username = remote_usernames(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:remote_usernames)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create remote_username" do
+    assert_difference('RemoteUsername.count') do
+      post :create, remote_username: { game_id: @remote_username.game_id, user_id: @remote_username.user_id, user_name: @remote_username.user_name }
+    end
+
+    assert_redirected_to remote_username_path(assigns(:remote_username))
+  end
+
+  test "should show remote_username" do
+    get :show, id: @remote_username
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @remote_username
+    assert_response :success
+  end
+
+  test "should update remote_username" do
+    patch :update, id: @remote_username, remote_username: { game_id: @remote_username.game_id, user_id: @remote_username.user_id, user_name: @remote_username.user_name }
+    assert_redirected_to remote_username_path(assigns(:remote_username))
+  end
+
+  test "should destroy remote_username" do
+    assert_difference('RemoteUsername.count', -1) do
+      delete :destroy, id: @remote_username
+    end
+
+    assert_redirected_to remote_usernames_path
+  end
+end
diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
index a5cc8cb..a144bf8 100644
--- a/test/controllers/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
@@ -18,7 +18,7 @@ class SessionsControllerTest < ActionController::TestCase
 
   test "should create session" do
     assert_difference('Session.count') do
-      post :create, session: { user_id: @session.user_id }
+      post :create, session: { token: @session.token, user_id: @session.user_id }
     end
 
     assert_redirected_to session_path(assigns(:session))
@@ -35,7 +35,7 @@ class SessionsControllerTest < ActionController::TestCase
   end
 
   test "should update session" do
-    patch :update, id: @session, session: { user_id: @session.user_id }
+    patch :update, id: @session, session: { token: @session.token, user_id: @session.user_id }
     assert_redirected_to session_path(assigns(:session))
   end
 
diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb
index 0c1ff60..d5ab2af 100644
--- a/test/controllers/tournaments_controller_test.rb
+++ b/test/controllers/tournaments_controller_test.rb
@@ -18,7 +18,7 @@ class TournamentsControllerTest < ActionController::TestCase
 
   test "should create tournament" do
     assert_difference('Tournament.count') do
-      post :create, tournament: { game_id: @tournament.game_id, name: @tournament.name, randomized_teams: @tournament.randomized_teams, status: @tournament.status }
+      post :create, tournament: { game_id: @tournament.game_id, max_players_per_team: @tournament.max_players_per_team, max_teams_per_match: @tournament.max_teams_per_match, min_players_per_team: @tournament.min_players_per_team, min_teams_per_match: @tournament.min_teams_per_match, name: @tournament.name, randomized_teams: @tournament.randomized_teams, set_rounds: @tournament.set_rounds, status: @tournament.status }
     end
 
     assert_redirected_to tournament_path(assigns(:tournament))
@@ -35,7 +35,7 @@ class TournamentsControllerTest < ActionController::TestCase
   end
 
   test "should update tournament" do
-    patch :update, id: @tournament, tournament: { game_id: @tournament.game_id, name: @tournament.name, randomized_teams: @tournament.randomized_teams, status: @tournament.status }
+    patch :update, id: @tournament, tournament: { game_id: @tournament.game_id, max_players_per_team: @tournament.max_players_per_team, max_teams_per_match: @tournament.max_teams_per_match, min_players_per_team: @tournament.min_players_per_team, min_teams_per_match: @tournament.min_teams_per_match, name: @tournament.name, randomized_teams: @tournament.randomized_teams, set_rounds: @tournament.set_rounds, status: @tournament.status }
     assert_redirected_to tournament_path(assigns(:tournament))
   end