Merge branch 'master' of http://github.com/LukeShu/leaguer

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/views/games/index.html.erb
	db/migrate/20140304043618_create_servers.rb
	db/migrate/20140304043622_create_matches.rb
	db/migrate/20140304043631_create_games.rb

13 files changed, 420 insertions, 0 deletions

diff --git a/test/controllers/.keep b/test/controllers/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/controllers/.keep
diff --git a/test/controllers/alerts_controller_test.rb b/test/controllers/alerts_controller_test.rb
new file mode 100644
index 0000000..4a5d911
--- /dev/null
+++ b/test/controllers/alerts_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class AlertsControllerTest < ActionController::TestCase
+  setup do
+    @alert = alerts(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:alerts)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create alert" do
+    assert_difference('Alert.count') do
+      post :create, alert: { author_id: @alert.author_id, message: @alert.message }
+    end
+
+    assert_redirected_to alert_path(assigns(:alert))
+  end
+
+  test "should show alert" do
+    get :show, id: @alert
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @alert
+    assert_response :success
+  end
+
+  test "should update alert" do
+    patch :update, id: @alert, alert: { author_id: @alert.author_id, message: @alert.message }
+    assert_redirected_to alert_path(assigns(:alert))
+  end
+
+  test "should destroy alert" do
+    assert_difference('Alert.count', -1) do
+      delete :destroy, id: @alert
+    end
+
+    assert_redirected_to alerts_path
+  end
+end
diff --git a/test/controllers/games_controller_test.rb b/test/controllers/games_controller_test.rb
new file mode 100644
index 0000000..95c3145
--- /dev/null
+++ b/test/controllers/games_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class GamesControllerTest < ActionController::TestCase
+  setup do
+    @game = games(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:games)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create game" do
+    assert_difference('Game.count') do
+      post :create, game: { name: @game.name, players_per_team: @game.players_per_team, randomized_teams: @game.randomized_teams, set_rounds: @game.set_rounds, teams_per_match: @game.teams_per_match }
+    end
+
+    assert_redirected_to game_path(assigns(:game))
+  end
+
+  test "should show game" do
+    get :show, id: @game
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @game
+    assert_response :success
+  end
+
+  test "should update game" do
+    patch :update, id: @game, game: { name: @game.name, players_per_team: @game.players_per_team, randomized_teams: @game.randomized_teams, set_rounds: @game.set_rounds, teams_per_match: @game.teams_per_match }
+    assert_redirected_to game_path(assigns(:game))
+  end
+
+  test "should destroy game" do
+    assert_difference('Game.count', -1) do
+      delete :destroy, id: @game
+    end
+
+    assert_redirected_to games_path
+  end
+end
diff --git a/test/controllers/main_controller_test.rb b/test/controllers/main_controller_test.rb
new file mode 100644
index 0000000..b7ec6bf
--- /dev/null
+++ b/test/controllers/main_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class MainControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/controllers/matches_controller_test.rb b/test/controllers/matches_controller_test.rb
new file mode 100644
index 0000000..50675d8
--- /dev/null
+++ b/test/controllers/matches_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class MatchesControllerTest < ActionController::TestCase
+  setup do
+    @match = matches(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:matches)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create match" do
+    assert_difference('Match.count') do
+      post :create, match: { name: @match.name, tournament_id: @match.tournament_id }
+    end
+
+    assert_redirected_to match_path(assigns(:match))
+  end
+
+  test "should show match" do
+    get :show, id: @match
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @match
+    assert_response :success
+  end
+
+  test "should update match" do
+    patch :update, id: @match, match: { name: @match.name, tournament_id: @match.tournament_id }
+    assert_redirected_to match_path(assigns(:match))
+  end
+
+  test "should destroy match" do
+    assert_difference('Match.count', -1) do
+      delete :destroy, id: @match
+    end
+
+    assert_redirected_to matches_path
+  end
+end
diff --git a/test/controllers/pms_controller_test.rb b/test/controllers/pms_controller_test.rb
new file mode 100644
index 0000000..18b2449
--- /dev/null
+++ b/test/controllers/pms_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class PmsControllerTest < ActionController::TestCase
+  setup do
+    @pm = pms(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:pms)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create pm" do
+    assert_difference('Pm.count') do
+      post :create, pm: { author_id: @pm.author_id, message: @pm.message, recipient_id: @pm.recipient_id }
+    end
+
+    assert_redirected_to pm_path(assigns(:pm))
+  end
+
+  test "should show pm" do
+    get :show, id: @pm
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @pm
+    assert_response :success
+  end
+
+  test "should update pm" do
+    patch :update, id: @pm, pm: { author_id: @pm.author_id, message: @pm.message, recipient_id: @pm.recipient_id }
+    assert_redirected_to pm_path(assigns(:pm))
+  end
+
+  test "should destroy pm" do
+    assert_difference('Pm.count', -1) do
+      delete :destroy, id: @pm
+    end
+
+    assert_redirected_to pms_path
+  end
+end
diff --git a/test/controllers/search_controller_test.rb b/test/controllers/search_controller_test.rb
new file mode 100644
index 0000000..bfbf22d
--- /dev/null
+++ b/test/controllers/search_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class SearchControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/controllers/servers_controller_test.rb b/test/controllers/servers_controller_test.rb
new file mode 100644
index 0000000..5891bb0
--- /dev/null
+++ b/test/controllers/servers_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class ServersControllerTest < ActionController::TestCase
+  setup do
+    @server = servers(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:servers)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create server" do
+    assert_difference('Server.count') do
+      post :create, server: {  }
+    end
+
+    assert_redirected_to server_path(assigns(:server))
+  end
+
+  test "should show server" do
+    get :show, id: @server
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @server
+    assert_response :success
+  end
+
+  test "should update server" do
+    patch :update, id: @server, server: {  }
+    assert_redirected_to server_path(assigns(:server))
+  end
+
+  test "should destroy server" do
+    assert_difference('Server.count', -1) do
+      delete :destroy, id: @server
+    end
+
+    assert_redirected_to servers_path
+  end
+end
diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
new file mode 100644
index 0000000..d30ebc3
--- /dev/null
+++ b/test/controllers/sessions_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class SessionsControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/controllers/static_controller_test.rb b/test/controllers/static_controller_test.rb
new file mode 100644
index 0000000..e62ae2a
--- /dev/null
+++ b/test/controllers/static_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class StaticControllerTest < ActionController::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
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
diff --git a/test/controllers/tournaments_controller_test.rb b/test/controllers/tournaments_controller_test.rb
new file mode 100644
index 0000000..bdbbfac
--- /dev/null
+++ b/test/controllers/tournaments_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class TournamentsControllerTest < ActionController::TestCase
+  setup do
+    @tournament = tournaments(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:tournaments)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create tournament" do
+    assert_difference('Tournament.count') do
+      post :create, tournament: { game_id: @tournament.game_id }
+    end
+
+    assert_redirected_to tournament_path(assigns(:tournament))
+  end
+
+  test "should show tournament" do
+    get :show, id: @tournament
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @tournament
+    assert_response :success
+  end
+
+  test "should update tournament" do
+    patch :update, id: @tournament, tournament: { game_id: @tournament.game_id }
+    assert_redirected_to tournament_path(assigns(:tournament))
+  end
+
+  test "should destroy tournament" do
+    assert_difference('Tournament.count', -1) do
+      delete :destroy, id: @tournament
+    end
+
+    assert_redirected_to tournaments_path
+  end
+end
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
new file mode 100644
index 0000000..79a5700
--- /dev/null
+++ b/test/controllers/users_controller_test.rb
@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class UsersControllerTest < ActionController::TestCase
+  setup do
+    @user = users(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:users)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create user" do
+    assert_difference('User.count') do
+      post :create, user: { email: @user.email, name: @user.name, user_name: @user.user_name }
+    end
+
+    assert_redirected_to user_path(assigns(:user))
+  end
+
+  test "should show user" do
+    get :show, id: @user
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @user
+    assert_response :success
+  end
+
+  test "should update user" do
+    patch :update, id: @user, user: { email: @user.email, name: @user.name, user_name: @user.user_name }
+    assert_redirected_to user_path(assigns(:user))
+  end
+
+  test "should destroy user" do
+    assert_difference('User.count', -1) do
+      delete :destroy, id: @user
+    end
+
+    assert_redirected_to users_path
+  end
+end