diff options
| author | tkimia <tkimia@purdue.edu> | 2014-04-22 01:50:36 -0400 |
|---|---|---|
| committer | tkimia <tkimia@purdue.edu> | 2014-04-22 01:50:36 -0400 |
| commit | 9c0e7d91ec76c44ca63f87b2bcd46ff16cacc38b (patch) | |
| tree | 163b6c1eb5d9b97a8836f176e7d90f209458ce04 /test/models | |
| parent | d75fe3934366ea5e2581df6111c6bccdb77d1e95 (diff) | |
| parent | aa8437947b28dda73bcfaf3caccb738e5e2f48b3 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'test/models')
| -rw-r--r-- | test/models/api_requests_test.rb (renamed from test/models/server_setting_test.rb) | 2 | ||||
| -rw-r--r-- | test/models/tournament_setting_test.rb (renamed from test/models/tournament_preference_test.rb) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/models/server_setting_test.rb b/test/models/api_requests_test.rb index eee32c1..18763a7 100644 --- a/test/models/server_setting_test.rb +++ b/test/models/api_requests_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class ServerSettingTest < ActiveSupport::TestCase +class ApiRequestsTest < ActiveSupport::TestCase # test "the truth" do # assert true # end diff --git a/test/models/tournament_preference_test.rb b/test/models/tournament_setting_test.rb index e200b8e..644df85 100644 --- a/test/models/tournament_preference_test.rb +++ b/test/models/tournament_setting_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class TournamentPreferenceTest < ActiveSupport::TestCase +class TournamentSettingTest < ActiveSupport::TestCase # test "the truth" do # assert true # end |