sidekiq 3.5.0 → 3.5.1

data/test/test_scheduled.rb

@@ -10,11 +10,7 @@ class TestScheduled < Sidekiq::Test
 
   describe 'poller' do
     before do
-      Sidekiq.redis = REDIS
-      Sidekiq.redis do |conn|
-        conn.flushdb
-      end
-
+      Sidekiq.redis{|c| c.flushdb}
       @error_1  = { 'class' => ScheduledWorker.name, 'args' => [0], 'queue' => 'queue_1' }
       @error_2  = { 'class' => ScheduledWorker.name, 'args' => [1], 'queue' => 'queue_2' }
       @error_3  = { 'class' => ScheduledWorker.name, 'args' => [2], 'queue' => 'queue_3' }
@@ -28,8 +24,8 @@ class TestScheduled < Sidekiq::Test
     end
 
     class Stopper
-      def call(worker_class, message, queue, r)
-        yield if message['args'].first.odd?
+      def call(worker_class, job, queue, r)
+        yield if job['args'].first.odd?
       end
     end
 
@@ -43,12 +39,10 @@ class TestScheduled < Sidekiq::Test
 
         @poller.poll
 
-        Sidekiq.redis do |conn|
-          assert_equal 0, conn.llen("queue:queue_1")
-          assert_equal 1, conn.llen("queue:queue_2")
-          assert_equal 0, conn.llen("queue:queue_5")
-          assert_equal 1, conn.llen("queue:queue_6")
-        end
+        assert_equal 0, Sidekiq::Queue.new("queue_1").size
+        assert_equal 1, Sidekiq::Queue.new("queue_2").size
+        assert_equal 0, Sidekiq::Queue.new("queue_5").size
+        assert_equal 1, Sidekiq::Queue.new("queue_6").size
       ensure
         Sidekiq.client_middleware.remove Stopper
       end

data/test/test_scheduling.rb

@@ -3,20 +3,6 @@ require 'sidekiq/scheduled'
 
 class TestScheduling < Sidekiq::Test
   describe 'middleware' do
-    before do
-      Sidekiq::Client.instance_variable_set(:@default, nil)
-      @redis = Minitest::Mock.new
-      # Ugh, this is terrible.
-      Sidekiq.instance_variable_set(:@redis, @redis)
-      def @redis.multi; [yield] * 2 if block_given?; end
-      def @redis.with; yield self; end
-    end
-
-    after do
-      Sidekiq::Client.instance_variable_set(:@default, nil)
-      Sidekiq.instance_variable_set(:@redis, REDIS)
-    end
-
     class ScheduledWorker
       include Sidekiq::Worker
       sidekiq_options :queue => :custom_queue
@@ -24,47 +10,39 @@ class TestScheduling < Sidekiq::Test
       end
     end
 
-    it 'schedules a job via interval' do
-      @redis.expect :zadd, true, ['schedule', Array]
+    it 'schedules jobs' do
+      ss = Sidekiq::ScheduledSet.new
+      ss.clear
+
+      assert_equal 0, ss.size
+
       assert ScheduledWorker.perform_in(600, 'mike')
-      @redis.verify
-    end
+      assert_equal 1, ss.size
 
-    it 'schedules a job in one month' do
-      @redis.expect :zadd, true do |key, args|
-        assert_equal 'schedule', key
-        assert_in_delta 1.month.since.to_f, args[0][0].to_f, 1
-      end
       assert ScheduledWorker.perform_in(1.month, 'mike')
-      @redis.verify
-    end
+      assert_equal 2, ss.size
 
-    it 'schedules a job via timestamp' do
-      @redis.expect :zadd, true, ['schedule', Array]
       assert ScheduledWorker.perform_in(5.days.from_now, 'mike')
-      @redis.verify
-    end
+      assert_equal 3, ss.size
 
-    it 'schedules job right away on negative timestamp/interval' do
-      @redis.expect :sadd,  true, ['queues', 'custom_queue']
-      @redis.expect :lpush, true, ['queue:custom_queue', Array]
+      q = Sidekiq::Queue.new("custom_queue")
+      qs = q.size
       assert ScheduledWorker.perform_in(-300, 'mike')
-      @redis.verify
-    end
+      assert_equal 3, ss.size
+      assert_equal qs+1, q.size
 
-    it 'schedules multiple jobs at once' do
-      @redis.expect :zadd, true, ['schedule', Array]
       assert Sidekiq::Client.push_bulk('class' => ScheduledWorker, 'args' => [['mike'], ['mike']], 'at' => 600)
-      @redis.verify
+      assert_equal 5, ss.size
     end
 
     it 'removes the enqueued_at field when scheduling' do
-      @redis.expect :zadd, true do |key, args|
-        job = Sidekiq.load_json(args.first.last)
-        job.key?('created_at') && !job.key?('enqueued_at')
-      end
+      ss = Sidekiq::ScheduledSet.new
+      ss.clear
+
       assert ScheduledWorker.perform_in(1.month, 'mike')
-      @redis.verify
+      job = ss.first
+      assert job['created_at']
+      refute job['enqueued_at']
     end
   end
 

data/test/test_sidekiq.rb

@@ -3,24 +3,16 @@ require_relative 'helper'
 
 class TestSidekiq < Sidekiq::Test
   describe 'json processing' do
-    it 'loads json' do
-      assert_equal ({"foo" => "bar"}), Sidekiq.load_json("{\"foo\":\"bar\"}")
-    end
-
-    it 'dumps json' do
+    it 'handles json' do
+      assert_equal({"foo" => "bar"}, Sidekiq.load_json("{\"foo\":\"bar\"}"))
       assert_equal "{\"foo\":\"bar\"}", Sidekiq.dump_json({ "foo" => "bar" })
     end
   end
 
   describe "redis connection" do
   	it "returns error without creating a connection if block is not given" do
-      mock = Minitest::Mock.new
-      mock.expect :create, nil #Sidekiq::RedisConnection, create
-  		assert_raises(ArgumentError) {
+  		assert_raises(ArgumentError) do
   			Sidekiq.redis
-  		}
-      assert_raises(MockExpectationError, "create should not be called") do
-        mock.verify
       end
   	end
   end
@@ -56,14 +48,14 @@ class TestSidekiq < Sidekiq::Test
   end
 
   describe 'default_worker_options' do
-    before do
+    it 'stringifies keys' do
       @old_options = Sidekiq.default_worker_options
-    end
-    after  { Sidekiq.default_worker_options = @old_options }
-
-    it 'stringify keys' do
-      Sidekiq.default_worker_options = { queue: 'cat'}
-      assert_equal 'cat', Sidekiq.default_worker_options['queue']
+      begin
+        Sidekiq.default_worker_options = { queue: 'cat'}
+        assert_equal 'cat', Sidekiq.default_worker_options['queue']
+      ensure
+        Sidekiq.default_worker_options = @old_options
+      end
     end
   end
 
@@ -84,4 +76,24 @@ class TestSidekiq < Sidekiq::Test
       assert_includes output, "ERROR"
     end
   end
+
+  describe 'redis connection' do
+    it 'does not continually retry' do
+      assert_raises Redis::CommandError do
+        Sidekiq.redis do |c|
+          raise Redis::CommandError, "READONLY You can't write against a read only slave."
+        end
+      end
+    end
+
+    it 'reconnects if connection is flagged as readonly' do
+      counts = []
+      Sidekiq.redis do |c|
+        counts << c.info['total_connections_received'].to_i
+        raise Redis::CommandError, "READONLY You can't write against a read only slave." if counts.size == 1
+      end
+      assert_equal 2, counts.size
+      assert_equal counts[0] + 1, counts[1]
+    end
+  end
 end

data/test/test_testing.rb

@@ -1,6 +1,5 @@
 require_relative 'helper'
-require 'sidekiq'
-require 'sidekiq/worker'
+
 require 'active_record'
 require 'action_mailer'
 require 'sidekiq/rails'
@@ -13,7 +12,7 @@ class TestTesting < Sidekiq::Test
   describe 'sidekiq testing' do
     describe 'require/load sidekiq/testing.rb' do
       before do
-        require 'sidekiq/testing.rb'
+        require 'sidekiq/testing'
       end
 
       after do
@@ -22,37 +21,43 @@ class TestTesting < Sidekiq::Test
 
       it 'enables fake testing' do
         Sidekiq::Testing.fake!
-        assert_equal true, Sidekiq::Testing.enabled?
-        assert_equal true, Sidekiq::Testing.fake?
+        assert Sidekiq::Testing.enabled?
+        assert Sidekiq::Testing.fake?
+        refute Sidekiq::Testing.inline?
       end
 
       it 'enables fake testing in a block' do
         Sidekiq::Testing.disable!
-        assert_equal true, Sidekiq::Testing.disabled?
+        assert Sidekiq::Testing.disabled?
+        refute Sidekiq::Testing.fake?
 
         Sidekiq::Testing.fake! do
-          assert_equal true, Sidekiq::Testing.enabled?
-          assert_equal true, Sidekiq::Testing.fake?
+          assert Sidekiq::Testing.enabled?
+          assert Sidekiq::Testing.fake?
+          refute Sidekiq::Testing.inline?
         end
 
-        assert_equal false, Sidekiq::Testing.enabled?
-        assert_equal false, Sidekiq::Testing.fake?
+        refute Sidekiq::Testing.enabled?
+        refute Sidekiq::Testing.fake?
       end
 
       it 'disables testing in a block' do
         Sidekiq::Testing.fake!
+        assert Sidekiq::Testing.fake?
 
         Sidekiq::Testing.disable! do
-          assert_equal true, Sidekiq::Testing.disabled?
+          refute Sidekiq::Testing.fake?
+          assert Sidekiq::Testing.disabled?
         end
 
-        assert_equal true, Sidekiq::Testing.enabled?
+        assert Sidekiq::Testing.fake?
+        assert Sidekiq::Testing.enabled?
       end
     end
 
     describe 'require/load sidekiq/testing/inline.rb' do
       before do
-        require 'sidekiq/testing/inline.rb'
+        require 'sidekiq/testing/inline'
       end
 
       after do
@@ -61,22 +66,77 @@ class TestTesting < Sidekiq::Test
 
       it 'enables inline testing' do
         Sidekiq::Testing.inline!
-        assert_equal true, Sidekiq::Testing.enabled?
-        assert_equal true, Sidekiq::Testing.inline?
+        assert Sidekiq::Testing.enabled?
+        assert Sidekiq::Testing.inline?
+        refute Sidekiq::Testing.fake?
       end
 
       it 'enables inline testing in a block' do
         Sidekiq::Testing.disable!
-        assert_equal true, Sidekiq::Testing.disabled?
+        assert Sidekiq::Testing.disabled?
+        refute Sidekiq::Testing.fake?
 
         Sidekiq::Testing.inline! do
-          assert_equal true, Sidekiq::Testing.enabled?
-          assert_equal true, Sidekiq::Testing.inline?
+          assert Sidekiq::Testing.enabled?
+          assert Sidekiq::Testing.inline?
         end
 
-        assert_equal false, Sidekiq::Testing.enabled?
-        assert_equal false, Sidekiq::Testing.inline?
+        refute Sidekiq::Testing.enabled?
+        refute Sidekiq::Testing.inline?
+        refute Sidekiq::Testing.fake?
       end
     end
   end
+
+  describe 'with middleware' do
+    before do
+      require 'sidekiq/testing'
+    end
+
+    after do
+      Sidekiq::Testing.disable!
+    end
+
+    class AttributeWorker
+      include Sidekiq::Worker
+      class_attribute :count
+      self.count = 0
+      attr_accessor :foo
+
+      def perform
+        self.class.count += 1 if foo == :bar
+      end
+    end
+
+    class AttributeMiddleware
+      def call(worker, msg, queue)
+        worker.foo = :bar if worker.respond_to?(:foo=)
+        yield
+      end
+    end
+
+    it 'wraps the inlined worker with middleware' do
+      Sidekiq::Testing.server_middleware do |chain|
+        chain.add AttributeMiddleware
+      end
+
+      begin
+        Sidekiq::Testing.fake! do
+          AttributeWorker.perform_async
+          assert_equal 0, AttributeWorker.count
+        end
+
+        AttributeWorker.perform_one
+        assert_equal 1, AttributeWorker.count
+
+        Sidekiq::Testing.inline! do
+          AttributeWorker.perform_async
+          assert_equal 2, AttributeWorker.count
+        end
+      ensure
+        Sidekiq::Testing.server_middleware.clear
+      end
+    end
+  end
+
 end

data/test/test_testing_fake.rb

@@ -1,6 +1,5 @@
 require_relative 'helper'
-require 'sidekiq'
-require 'sidekiq/worker'
+
 require 'active_record'
 require 'action_mailer'
 require 'sidekiq/rails'
@@ -47,7 +46,7 @@ class TestTesting < Sidekiq::Test
     end
 
     before do
-      require 'sidekiq/testing.rb'
+      require 'sidekiq/testing'
       Sidekiq::Testing.fake!
       EnqueuedWorker.jobs.clear
       DirectWorker.jobs.clear
@@ -106,7 +105,6 @@ class TestTesting < Sidekiq::Test
         StoredWorker.drain
       end
       assert_equal 0, StoredWorker.jobs.size
-
     end
 
     class SpecificJidWorker
@@ -263,9 +261,8 @@ class TestTesting < Sidekiq::Test
     end
 
     it 'can execute a job' do
-      worker = Minitest::Mock.new
-      worker.expect(:perform, nil, [1, 2, 3])
-      DirectWorker.execute_job(worker, [1, 2, 3])
+      DirectWorker.execute_job(DirectWorker.new, [2, 3])
     end
+
   end
 end

data/test/test_testing_inline.rb

@@ -1,6 +1,5 @@
 require_relative 'helper'
-require 'sidekiq'
-require 'sidekiq/worker'
+
 require 'active_record'
 require 'action_mailer'
 require 'sidekiq/rails'
@@ -42,7 +41,7 @@ class TestInline < Sidekiq::Test
     end
 
     before do
-      require 'sidekiq/testing/inline.rb'
+      require 'sidekiq/testing/inline'
       Sidekiq::Testing.inline!
     end
 
@@ -89,5 +88,6 @@ class TestInline < Sidekiq::Test
     it 'should relay parameters through json' do
       assert Sidekiq::Client.enqueue(InlineWorkerWithTimeParam, Time.now)
     end
+
   end
 end

data/test/test_util.rb

@@ -1,6 +1,4 @@
 require_relative 'helper'
-require 'sidekiq'
-require 'sidekiq/web_helpers'
 
 class TestUtil < Sidekiq::Test
 

data/test/test_web.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require_relative 'helper'
-require 'sidekiq'
 require 'sidekiq/web'
 require 'rack/test'
 require 'tilt/erubis'
@@ -19,7 +18,6 @@ class TestWeb < Sidekiq::Test
     end
 
     before do
-      Sidekiq.redis = REDIS
       Sidekiq.redis {|c| c.flushdb }
     end
 
@@ -41,6 +39,15 @@ class TestWeb < Sidekiq::Test
       rackenv = {'HTTP_ACCEPT_LANGUAGE' => 'en-us'}
       get '/', {}, rackenv
       assert_match(/Dashboard/, last_response.body)
+      rackenv = {'HTTP_ACCEPT_LANGUAGE' => 'zh-cn'}
+      get '/', {}, rackenv
+      assert_match(/信息板/, last_response.body)
+      rackenv = {'HTTP_ACCEPT_LANGUAGE' => 'zh-tw'}
+      get '/', {}, rackenv
+      assert_match(/資訊主頁/, last_response.body)
+      rackenv = {'HTTP_ACCEPT_LANGUAGE' => 'nb'}
+      get '/', {}, rackenv
+      assert_match(/Oversikt/, last_response.body)
     end
 
     describe 'busy' do