diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 21:03:17 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 21:03:17 -0400 |
| commit | c93c9f837c09ba0385690fb1a228a9c506ca120c (patch) | |
| tree | 19f115b0bc62fefc45f9c25ec4beeefee6429c8b /test | |
| parent | 9003a9099719a771fbbb9d2e8a4bfb093f35929a (diff) | |
| parent | 933199499f9adfa0347783c538a10b88ffb1b98b (diff) | |
Merge branch 'clean2'
Conflicts:
app/assets/stylesheets/static.css.scss
app/controllers/static_controller.rb
Diffstat (limited to 'test')
| -rw-r--r-- | test/controllers/static_controller_test.rb | 7 | ||||
| -rw-r--r-- | test/helpers/static_helper_test.rb | 4 |
2 files changed, 0 insertions, 11 deletions
diff --git a/test/controllers/static_controller_test.rb b/test/controllers/static_controller_test.rb deleted file mode 100644 index e62ae2a..0000000 --- a/test/controllers/static_controller_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class StaticControllerTest < ActionController::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/test/helpers/static_helper_test.rb b/test/helpers/static_helper_test.rb deleted file mode 100644 index 3b96f2b..0000000 --- a/test/helpers/static_helper_test.rb +++ /dev/null @@ -1,4 +0,0 @@ -require 'test_helper' - -class StaticHelperTest < ActionView::TestCase -end |