From 71f60bd3409b6b1024d4c2fe22ecca4eadc0e6f6 Mon Sep 17 00:00:00 2001 From: Scott Carleton Date: Mon, 22 Dec 2014 22:28:19 -0600 Subject: [PATCH] Removed most of Test::Unit Keeping base_delayed_paperclip_test until test parity achieved Dropped support for rbx-19 --- .travis.yml | 7 +---- README.md | 2 -- Rakefile | 2 +- test/base_delayed_paperclip_test.rb | 4 +++ test/delayed_paperclip_test.rb | 47 ---------------------------- test/fixtures/12k.png | Bin 12093 -> 0 bytes test/resque_paperclip_test.rb | 32 ------------------- test/sidekiq_paperclip.rb | 39 ----------------------- test/test_helper.rb | 4 +++ 9 files changed, 10 insertions(+), 127 deletions(-) delete mode 100644 test/delayed_paperclip_test.rb delete mode 100644 test/fixtures/12k.png delete mode 100644 test/resque_paperclip_test.rb delete mode 100644 test/sidekiq_paperclip.rb diff --git a/.travis.yml b/.travis.yml index 8c0ab52..55fbeb9 100644 --- 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 index 2bab214..d39779d 100644 --- 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 ```` \ No newline at end of file diff --git a/Rakefile b/Rakefile index a8dfef3..cb532d1 100644 --- 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 index ee8d05f..7836c6c 100644 --- 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 deleted file mode 100644 index 06234a9..0000000 --- a/test/delayed_paperclip_test.rb +++ /dev/null @@ -1,47 +0,0 @@ -require 'test_helper' -require 'base_delayed_paperclip_test' -require 'delayed_job' - -Delayed::Worker.backend = :active_record - -class DelayedPaperclipTest < Test::Unit::TestCase - include BaseDelayedPaperclipTest - - def setup - super - DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::DelayedJob - build_delayed_jobs - end - - def process_jobs - Delayed::Worker.new.work_off - end - - def jobs_count - Delayed::Job.count - end - - def test_perform_job - dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png")) - dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png") - Paperclip::Attachment.any_instance.expects(:reprocess!) - dummy.save! - Delayed::Job.last.payload_object.perform - end - - def build_delayed_jobs - ActiveRecord::Base.connection.create_table :delayed_jobs, :force => true do |table| - table.integer :priority, :default => 0 # Allows some jobs to jump to the front of the queue - table.integer :attempts, :default => 0 # Provides for retries, but still fail eventually. - table.text :handler # YAML-encoded string of the object that will do work - table.string :last_error # reason for last failure (See Note below) - table.datetime :run_at # When to run. Could be Time.now for immediately, or sometime in the future. - table.datetime :locked_at # Set when a client is working on this object - table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead) - table.string :locked_by # Who is working on this object (if locked) - table.string :queue - table.timestamps - end - end - -end diff --git a/test/fixtures/12k.png b/test/fixtures/12k.png deleted file mode 100644 index f819d45195c3155fce332105f54d089f77b6f05c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12093 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 t!6W285 File.open("#{RAILS_ROOT}/test/fixtures/12k.png")) - dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png") - Paperclip::Attachment.any_instance.expects(:reprocess!) - dummy.save! - DelayedPaperclip::Jobs::Resque.perform(dummy.class.name, dummy.id, :image) - end - -end diff --git a/test/sidekiq_paperclip.rb b/test/sidekiq_paperclip.rb deleted file mode 100644 index e234e8b..0000000 --- a/test/sidekiq_paperclip.rb +++ /dev/null @@ -1,39 +0,0 @@ -require 'test_helper' -require 'base_delayed_paperclip_test' -require 'sidekiq' - -class SidekiqPaperclipTest < Test::Unit::TestCase - include BaseDelayedPaperclipTest - - def setup - super - # Make sure that we just test Sidekiq in here - DelayedPaperclip.options[:background_job_class] = DelayedPaperclip::Jobs::Sidekiq - Sidekiq::Queue.new(:paperclip).clear - end - - def process_jobs - Sidekiq::Queue.new(:paperclip).each do |job| - worker = job.klass.constantize.new - args = job.args - begin - worker.perform(*args) - rescue # Assume sidekiq handle exception properly - end - job.delete - end - end - - def jobs_count - Sidekiq::Queue.new(:paperclip).size - end - - def test_perform_job - dummy = Dummy.new(:image => File.open("#{RAILS_ROOT}/test/fixtures/12k.png")) - dummy.image = File.open("#{RAILS_ROOT}/test/fixtures/12k.png") - Paperclip::Attachment.any_instance.expects(:reprocess!) - dummy.save! - DelayedPaperclip::Jobs::Sidekiq.new.perform(dummy.class.name, dummy.id, :image) - end - -end diff --git a/test/test_helper.rb b/test/test_helper.rb index f0bb116..01d3add 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,3 +1,7 @@ +### +# DEPRECATED, Don't Use +### + require 'rubygems' begin