test/test_helper.rb in resque-retry-1.3.2 vs test/test_helper.rb in resque-retry-1.4.0

- old
+ new

@@ -2,11 +2,11 @@ $LOAD_PATH.unshift dir + '/../lib' $TESTING = true require 'rubygems' require 'timeout' -require 'minitest/unit' +require 'minitest/autorun' require 'minitest/pride' require 'rack/test' require 'mocha/setup' # Run code coverage in MRI 1.9 only. @@ -30,24 +30,19 @@ if !system('which redis-cli') puts '', "** `redis-cli` was not found in your PATH" abort '' end -# This code is run `at_exit` to setup everything before running the tests. -# Redis server is started before this code block runs. -at_exit do - next if $! +# This code is run after all the tests have finished running to ensure that the +# Redis server is shutdowa +Minitest.after_run { `redis-cli -p 9736 shutdown nosave` } - exit_code = MiniTest::Unit.new.run(ARGV) - `redis-cli -p 9736 shutdown nosave` -end - puts "Starting redis for testing at localhost:9736..." `redis-server #{dir}/redis-test.conf` Resque.redis = '127.0.0.1:9736' # Test helpers -class MiniTest::Unit::TestCase +class Minitest::Test def perform_next_job(worker, &block) return unless job = worker.reserve worker.perform(job, &block) worker.done_working end