diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-03 23:06:47 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-03 23:06:47 -0500 |
commit | 8b526eadfcb024a5e8ead4c5b63eacb554db0cf5 (patch) | |
tree | c96e10e0e0e48154430a4d733c6385433dbe2739 /test/models | |
parent | 3c9da1eee130d49f998016f8bad91f97f8bdf100 (diff) | |
parent | 423d0e5a440d8d66407522bc842ef273196173bc (diff) |
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
Diffstat (limited to 'test/models')
-rw-r--r-- | test/models/.keep | 0 | ||||
-rw-r--r-- | test/models/alert_test.rb | 7 | ||||
-rw-r--r-- | test/models/game_attribute_test.rb | 7 | ||||
-rw-r--r-- | test/models/game_test.rb | 7 | ||||
-rw-r--r-- | test/models/match_test.rb | 7 | ||||
-rw-r--r-- | test/models/pm_test.rb | 7 | ||||
-rw-r--r-- | test/models/server_settings_test.rb | 7 | ||||
-rw-r--r-- | test/models/server_test.rb | 7 | ||||
-rw-r--r-- | test/models/team_match_pair_test.rb | 7 | ||||
-rw-r--r-- | test/models/team_test.rb | 7 | ||||
-rw-r--r-- | test/models/tournament_option_test.rb | 7 | ||||
-rw-r--r-- | test/models/tournament_test.rb | 7 | ||||
-rw-r--r-- | test/models/user_team_pair_test.rb | 7 | ||||
-rw-r--r-- | test/models/user_test.rb | 7 |
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 |