Merge pull request #123 from ScotterC/remove-test-unit

Removing Test::Unit
jrgifford · Dec 23, 2014 · c531505 · c531505
2 parents 30f7156 + 71f60bd
commit c531505
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 127 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ language: ruby
 rvm:
   - 2.1
   - 2.0
-  - rbx-19mode
 
 gemfile:
   - gemfiles/3.2.gemfile
@@ -12,14 +11,10 @@ gemfile:
 
 sudo: false
 
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode
-
 services:
   - redis
 
-script: "bundle exec rake clean test spec"
+script: "bundle exec rake clean spec"
 
 notifications:
   email:

diff --git a/README.md b/README.md
@@ -272,6 +272,4 @@ for testing. Run all tests with
 ````
 # Rspec on all versions
 rake appraisal spec
-# Test Unit on all versions (deprecated)
-rake appraisal test
 ````
diff --git a/Rakefile b/Rakefile
@@ -9,7 +9,7 @@ require 'rake/testtask'
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
 
 desc 'Default: run unit tests.'
-task :default => [:clean, 'appraisal:install', :all]
+task default: [:clean, 'appraisal:install', :all]
 
 desc 'Test the delayed paperclip plugin under all supported Rails versions.'
 task :all do |t|

diff --git a/test/base_delayed_paperclip_test.rb b/test/base_delayed_paperclip_test.rb
@@ -1,3 +1,7 @@
+###
+#  DEPRECATED, Don't Use
+###
+
 module BaseDelayedPaperclipTest
   def setup
     super

diff --git a/test/delayed_paperclip_test.rb b/test/delayed_paperclip_test.rb
diff --git a/test/fixtures/12k.png b/test/fixtures/12k.png
diff --git a/test/resque_paperclip_test.rb b/test/resque_paperclip_test.rb
diff --git a/test/sidekiq_paperclip.rb b/test/sidekiq_paperclip.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,3 +1,7 @@
+###
+#  DEPRECATED, Don't Use
+###
+
 require 'rubygems'
 
 begin