diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:45:22 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:45:22 -0400 |
commit | 7d40d2ed8bd686b32ff9bc620936a72044a610bc (patch) | |
tree | 4e46ac6a1fca51e272837ef0d8f5921f3991e914 /test/models | |
parent | d3bee0f1ce0c5dc3fa741338bc6d9914e9e92787 (diff) | |
parent | 07476fd9a2b942e8d6056804bb1cdbd5e9a1c528 (diff) |
Merge branch 'clean2'
Conflicts:
app/controllers/tournaments_controller.rb
app/models/match.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
Diffstat (limited to 'test/models')
-rw-r--r-- | test/models/statistic_test.rb (renamed from test/models/score_test.rb) | 2 | ||||
-rw-r--r-- | test/models/tournament_stage_test.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/test/models/score_test.rb b/test/models/statistic_test.rb index d38cb0a..e9e63bf 100644 --- a/test/models/score_test.rb +++ b/test/models/statistic_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class ScoreTest < ActiveSupport::TestCase +class StatisticTest < ActiveSupport::TestCase # test "the truth" do # assert true # end diff --git a/test/models/tournament_stage_test.rb b/test/models/tournament_stage_test.rb new file mode 100644 index 0000000..10a3a92 --- /dev/null +++ b/test/models/tournament_stage_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class TournamentStageTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end |