summaryrefslogtreecommitdiff
path: root/test/models
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-03-06 22:34:08 -0500
committerAndrewMurrell <amurrel@purdue.edu>2014-03-06 22:34:08 -0500
commit3ce5876375cbb3057ffc96e2886ba57cbd875dc9 (patch)
treee59dc46b293cdcd4ad8ad5b33bd4703f65adb0d9 /test/models
parentce8b05ed8fa3466c727269daa47ba7df672fdca1 (diff)
parent70bae69d731afc5300ffa5b176732ebe27d0810f (diff)
Fixed some merge errors in show.html.erb
Diffstat (limited to 'test/models')
-rw-r--r--test/models/team_match_pair_test.rb7
-rw-r--r--test/models/tournament_user_pair_test.rb7
-rw-r--r--test/models/user_team_pair_test.rb7
-rw-r--r--test/models/user_tournament_pair_test.rb7
4 files changed, 0 insertions, 28 deletions
diff --git a/test/models/team_match_pair_test.rb b/test/models/team_match_pair_test.rb
deleted file mode 100644
index c250b3c..0000000
--- a/test/models/team_match_pair_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class TeamMatchPairTest < ActiveSupport::TestCase
- # test "the truth" do
- # assert true
- # end
-end
diff --git a/test/models/tournament_user_pair_test.rb b/test/models/tournament_user_pair_test.rb
deleted file mode 100644
index c8d1789..0000000
--- a/test/models/tournament_user_pair_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class TournamentUserPairTest < 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
deleted file mode 100644
index 55f5c58..0000000
--- a/test/models/user_team_pair_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class UserTeamPairTest < ActiveSupport::TestCase
- # test "the truth" do
- # assert true
- # end
-end
diff --git a/test/models/user_tournament_pair_test.rb b/test/models/user_tournament_pair_test.rb
deleted file mode 100644
index 6167ff6..0000000
--- a/test/models/user_tournament_pair_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class UserTournamentPairTest < ActiveSupport::TestCase
- # test "the truth" do
- # assert true
- # end
-end