Skip to content

Commit

Permalink
Merge pull request resque#520 from tenderlove/warnings
Browse files Browse the repository at this point in the history
removing bundler and eliminating some test warnings
  • Loading branch information
hone committed Feb 28, 2012
2 parents 96bb1b2 + 9624a63 commit e5deeed
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions lib/resque/worker.rb
Expand Up @@ -89,6 +89,8 @@ def self.exists?(worker_id)
# removed without needing to restart workers using this method.
def initialize(*queues)
@queues = queues.map { |queue| queue.to_s.strip }
@shutdown = nil
@paused = nil
validate_queues
end

Expand Down
6 changes: 3 additions & 3 deletions test/test_helper.rb
@@ -1,13 +1,13 @@
require 'rubygems'
require 'bundler'
Bundler.setup(:default, :test)
Bundler.require(:default, :test)

dir = File.dirname(File.expand_path(__FILE__))
$LOAD_PATH.unshift dir + '/../lib'
$TESTING = true
require 'test/unit'

require 'redis/namespace'
require 'resque'

begin
require 'leftright'
rescue LoadError
Expand Down

0 comments on commit e5deeed

Please sign in to comment.