summaryrefslogtreecommitdiff
path: root/test/models/pm_test.rb
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-03-03 23:06:47 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-03-03 23:06:47 -0500
commit8b526eadfcb024a5e8ead4c5b63eacb554db0cf5 (patch)
treec96e10e0e0e48154430a4d733c6385433dbe2739 /test/models/pm_test.rb
parent3c9da1eee130d49f998016f8bad91f97f8bdf100 (diff)
parent423d0e5a440d8d66407522bc842ef273196173bc (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/pm_test.rb')
-rw-r--r--test/models/pm_test.rb7
1 files changed, 7 insertions, 0 deletions
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