Reconfiguring test directory structure to account for lack of shoulda…

… tests
thumblemonks · May 12, 2010 · b6a4087 · b6a4087
1 parent 40b1cd2
commit b6a4087
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 13 deletions.
diff --git a/Rakefile b/Rakefile
@@ -10,15 +10,7 @@ task(:set_test_env) { ENV['RACK_ENV'] ||= 'test' }
 desc "Run all tests"
 Rake::TestTask.new("test") do |t|
   t.libs.concat ['./lib', './test']
-  t.test_files = FileList['test/riot_tests/*_test.rb']
+  t.test_files = FileList['test/*_test.rb']
-  t.verbose = true
-end
-
-task "test:shoulda" => [:set_test_env]
-desc "Run all Shoulda based tests"
-Rake::TestTask.new("test:shoulda") do |t|
-  t.libs.concat ['./lib', './test']
-  t.test_files = FileList['test/shoulda_tests/*_test.rb']
   t.verbose = true
 end
 

diff --git a/test/riot_tests/application_test.rb → test/application_test.rb b/test/riot_tests/application_test.rb → test/application_test.rb
@@ -1,4 +1,4 @@
-require 'riot_tests/test_helper'
+require 'teststrap'
 
 context "Application Test:" do
 

diff --git a/test/riot_tests/helpers_test.rb → test/helpers_test.rb b/test/riot_tests/helpers_test.rb → test/helpers_test.rb
@@ -1,4 +1,4 @@
-require 'riot_tests/test_helper'
+require 'teststrap'
 
 context "Helpers Test:" do
   setup do

diff --git a/test/riot_tests/responders_test.rb → test/responders_test.rb b/test/riot_tests/responders_test.rb → test/responders_test.rb
@@ -1,4 +1,4 @@
-require 'riot_tests/test_helper'
+require 'teststrap'
 
 context "Responders Test:" do
   setup do

diff --git a/test/riot_tests/riot_macros_test.rb → test/riot_macros_test.rb b/test/riot_tests/riot_macros_test.rb → test/riot_macros_test.rb
@@ -1,4 +1,4 @@
-require 'riot_tests/test_helper'
+require 'teststrap'
 
 context "Riot Macros Test:" do
   setup do

diff --git a/test/riot_tests/test_helper.rb → test/teststrap.rb b/test/riot_tests/test_helper.rb → test/teststrap.rb