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

14 files changed, 91 insertions, 0 deletions

diff --git a/test/models/.keep b/test/models/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/models/.keep
diff --git a/test/models/alert_test.rb b/test/models/alert_test.rb
new file mode 100644
index 0000000..b59c65e
--- /dev/null
+++ b/test/models/alert_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class AlertTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/game_attribute_test.rb b/test/models/game_attribute_test.rb
new file mode 100644
index 0000000..13c6e65
--- /dev/null
+++ b/test/models/game_attribute_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class GameAttributeTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/game_test.rb b/test/models/game_test.rb
new file mode 100644
index 0000000..2cab36e
--- /dev/null
+++ b/test/models/game_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class GameTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/match_test.rb b/test/models/match_test.rb
new file mode 100644
index 0000000..14436b1
--- /dev/null
+++ b/test/models/match_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class MatchTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/pm_test.rb b/test/models/pm_test.rb
new file mode 100644
index 0000000..e7f6b8f
--- /dev/null
+++ b/test/models/pm_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class PmTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/server_settings_test.rb b/test/models/server_settings_test.rb
new file mode 100644
index 0000000..470b316
--- /dev/null
+++ b/test/models/server_settings_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ServerSettingsTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/server_test.rb b/test/models/server_test.rb
new file mode 100644
index 0000000..125ffc9
--- /dev/null
+++ b/test/models/server_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ServerTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/team_match_pair_test.rb b/test/models/team_match_pair_test.rb
new file mode 100644
index 0000000..c250b3c
--- /dev/null
+++ b/test/models/team_match_pair_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class TeamMatchPairTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/team_test.rb b/test/models/team_test.rb
new file mode 100644
index 0000000..8b101cb
--- /dev/null
+++ b/test/models/team_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class TeamTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/tournament_option_test.rb b/test/models/tournament_option_test.rb
new file mode 100644
index 0000000..8fa9628
--- /dev/null
+++ b/test/models/tournament_option_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class TournamentOptionTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/tournament_test.rb b/test/models/tournament_test.rb
new file mode 100644
index 0000000..24a7e5f
--- /dev/null
+++ b/test/models/tournament_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class TournamentTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/user_team_pair_test.rb b/test/models/user_team_pair_test.rb
new file mode 100644
index 0000000..55f5c58
--- /dev/null
+++ b/test/models/user_team_pair_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class UserTeamPairTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
new file mode 100644
index 0000000..82f61e0
--- /dev/null
+++ b/test/models/user_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class UserTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end