Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix tests for 1.9.2.
  • Loading branch information
phiggins authored and defunkt committed Mar 17, 2011
1 parent 7b6f3e9 commit c9abf3c
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 18 deletions.
19 changes: 13 additions & 6 deletions Rakefile
Expand Up @@ -3,7 +3,6 @@
#

load 'tasks/redis.rake'
require 'rake/testtask'

$LOAD_PATH.unshift 'lib'
require 'resque/tasks'
Expand All @@ -17,14 +16,22 @@ end
# Tests
#

require 'rake/testtask'

task :default => :test

desc "Run the test suite"
task :test do
rg = command?(:rg)
Dir['test/**/*_test.rb'].each do |f|
rg ? sh("rg #{f}") : ruby(f)
if command?(:rg)
desc "Run the test suite with rg"
task :test do
Dir['test/**/*_test.rb'].each do |f|
sh("rg #{f}")
end
end
else
Rake::TestTask.new do |test|
test.libs << "test"
test.test_files = FileList['test/**/*_test.rb']
end
end

if command? :kicker
Expand Down
2 changes: 1 addition & 1 deletion test/job_hooks_test.rb
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/test_helper'
require 'test_helper'

context "Resque::Job before_perform" do
include PerformJob
Expand Down
14 changes: 7 additions & 7 deletions test/job_plugins_test.rb
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/test_helper'
require 'test_helper'

context "Multiple plugins with multiple hooks" do
include PerformJob
Expand Down Expand Up @@ -45,7 +45,7 @@ def before_perform1(history)
end
end

class ::BeforePerformJob
class ::JobPluginsTestBeforePerformJob
extend BeforePerformPlugin
def self.perform(history)
history << :perform
Expand All @@ -56,7 +56,7 @@ def self.before_perform(history)
end

test "before_perform hooks are executed in order" do
result = perform_job(BeforePerformJob, history=[])
result = perform_job(JobPluginsTestBeforePerformJob, history=[])
assert_equal true, result, "perform returned true"
assert_equal [:before_perform, :before_perform1, :perform], history
end
Expand All @@ -71,7 +71,7 @@ def after_perform_record_history(history)
end
end

class ::AfterPerformJob
class ::JobPluginsTestAfterPerformJob
extend AfterPerformPlugin
def self.perform(history)
history << :perform
Expand All @@ -82,7 +82,7 @@ def self.after_perform(history)
end

test "after_perform hooks are executed in order" do
result = perform_job(AfterPerformJob, history=[])
result = perform_job(JobPluginsTestAfterPerformJob, history=[])
assert_equal true, result, "perform returned true"
assert_equal [:perform, :after_perform, :after_perform1], history
end
Expand Down Expand Up @@ -111,7 +111,7 @@ def self.perform(history)
assert_equal [:around_perform_plugin1, :perform], history
end

class ::AroundPerformJob
class ::JobPluginsTestAroundPerformJob
extend AroundPerformPlugin1
def self.perform(history)
history << :perform
Expand All @@ -123,7 +123,7 @@ def self.around_perform(history)
end

test "around_perform hooks are executed in order" do
result = perform_job(AroundPerformJob, history=[])
result = perform_job(JobPluginsTestAroundPerformJob, history=[])
assert_equal true, result, "perform returned true"
assert_equal [:around_perform, :around_perform_plugin1, :perform], history
end
Expand Down
2 changes: 1 addition & 1 deletion test/plugin_test.rb
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/test_helper'
require 'test_helper'

context "Resque::Plugin finding hooks" do
module SimplePlugin
Expand Down
2 changes: 1 addition & 1 deletion test/resque-web_test.rb
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/test_helper'
require 'test_helper'
require 'resque/server/test_helper'

# Root path test
Expand Down
2 changes: 1 addition & 1 deletion test/resque_test.rb
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/test_helper'
require 'test_helper'

context "Resque" do
setup do
Expand Down
2 changes: 2 additions & 0 deletions test/test_helper.rb
Expand Up @@ -66,6 +66,8 @@ def self.teardown(&block) define_method(:teardown, &block) end
end
(class << klass; self end).send(:define_method, :name) { name.gsub(/\W/,'_') }
klass.class_eval &block
# XXX: In 1.8.x, not all tests will run unless anonymous classes are kept in scope.
($test_classes ||= []) << klass
end

##
Expand Down
2 changes: 1 addition & 1 deletion test/worker_test.rb
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/test_helper'
require 'test_helper'

context "Resque::Worker" do
setup do
Expand Down

0 comments on commit c9abf3c

Please sign in to comment.