diff options
author | Tomer Kimia <tkimia@purdue.edu> | 2014-04-01 18:52:51 -0400 |
---|---|---|
committer | Tomer Kimia <tkimia@purdue.edu> | 2014-04-01 18:52:51 -0400 |
commit | f3125c3087ac7d47d1698b328c76620f6a5464e8 (patch) | |
tree | 0317eb2937326d889e1b23f31dba9c756e3f4703 /test/models | |
parent | aa6e8f12a24e33d88a5751cee5e93bf4a038e2ef (diff) | |
parent | e6b160bd81e51e0bd88e5c2563a06ea5f0d64620 (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'test/models')
-rw-r--r-- | test/models/remote_username_test.rb (renamed from test/models/server_settings_test.rb) | 2 | ||||
-rw-r--r-- | test/models/server_setting_test.rb (renamed from test/models/tournament_option_test.rb) | 2 | ||||
-rw-r--r-- | test/models/tournament_preference_test.rb | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/test/models/server_settings_test.rb b/test/models/remote_username_test.rb index 470b316..3321b6c 100644 --- a/test/models/server_settings_test.rb +++ b/test/models/remote_username_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class ServerSettingsTest < ActiveSupport::TestCase +class RemoteUsernameTest < ActiveSupport::TestCase # test "the truth" do # assert true # end diff --git a/test/models/tournament_option_test.rb b/test/models/server_setting_test.rb index 8fa9628..eee32c1 100644 --- a/test/models/tournament_option_test.rb +++ b/test/models/server_setting_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class TournamentOptionTest < ActiveSupport::TestCase +class ServerSettingTest < ActiveSupport::TestCase # test "the truth" do # assert true # end diff --git a/test/models/tournament_preference_test.rb b/test/models/tournament_preference_test.rb new file mode 100644 index 0000000..e200b8e --- /dev/null +++ b/test/models/tournament_preference_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class TournamentPreferenceTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end |