sidekiq 3.4.1 → 4.0.2

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
@@ -55,6 +54,7 @@ class TestTesting < Sidekiq::Test
 
     after do
       Sidekiq::Testing.disable!
+      Sidekiq::Queues.clear_all
     end
 
     it 'stubs the async call' do
@@ -94,7 +94,7 @@ class TestTesting < Sidekiq::Test
     it 'stubs the enqueue_to call' do
       assert_equal 0, EnqueuedWorker.jobs.size
       assert Sidekiq::Client.enqueue_to('someq', EnqueuedWorker, 1, 2)
-      assert_equal 1, EnqueuedWorker.jobs.size
+      assert_equal 1, Sidekiq::Queues['someq'].size
     end
 
     it 'executes all stored jobs' do
@@ -106,7 +106,6 @@ class TestTesting < Sidekiq::Test
         StoredWorker.drain
       end
       assert_equal 0, StoredWorker.jobs.size
-
     end
 
     class SpecificJidWorker
@@ -263,9 +262,85 @@ 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
+
+  describe 'queue testing' do
+    before do
+      require 'sidekiq/testing'
+      Sidekiq::Testing.fake!
+    end
+
+    after do
+      Sidekiq::Testing.disable!
+      Sidekiq::Queues.clear_all
+    end
+
+    class QueueWorker
+      include Sidekiq::Worker
+      def perform(a, b)
+        a + b
+      end
+    end
+
+    class AltQueueWorker
+      include Sidekiq::Worker
+      sidekiq_options queue: :alt
+      def perform(a, b)
+        a + b
+      end
+    end
+
+    it 'finds enqueued jobs' do
+      assert_equal 0, Sidekiq::Queues["default"].size
+
+      QueueWorker.perform_async(1, 2)
+      QueueWorker.perform_async(1, 2)
+      AltQueueWorker.perform_async(1, 2)
+
+      assert_equal 2, Sidekiq::Queues["default"].size
+      assert_equal [1, 2], Sidekiq::Queues["default"].first["args"]
+
+      assert_equal 1, Sidekiq::Queues["alt"].size
+    end
+
+    it 'clears out all queues' do
+      assert_equal 0, Sidekiq::Queues["default"].size
+
+      QueueWorker.perform_async(1, 2)
+      QueueWorker.perform_async(1, 2)
+      AltQueueWorker.perform_async(1, 2)
+
+      Sidekiq::Queues.clear_all
+
+      assert_equal 0, Sidekiq::Queues["default"].size
+      assert_equal 0, QueueWorker.jobs.size
+      assert_equal 0, Sidekiq::Queues["alt"].size
+      assert_equal 0, AltQueueWorker.jobs.size
+    end
+
+    it 'finds jobs enqueued by client' do
+      Sidekiq::Client.push(
+        'class' => 'NonExistentWorker',
+        'queue' => 'missing',
+        'args' => [1]
+      )
+
+      assert_equal 1, Sidekiq::Queues["missing"].size
+    end
+
+    it 'respects underlying array changes' do
+      # Rspec expect change() syntax saves a reference to
+      # an underlying array. When the array containing jobs is
+      # derived, Rspec test using `change(QueueWorker.jobs, :size).by(1)`
+      # won't pass. This attempts to recreate that scenario
+      # by saving a reference to the jobs array and ensuring
+      # it changes properly on enqueueing
+      jobs = QueueWorker.jobs
+      assert_equal 0, jobs.size
+      QueueWorker.perform_async(1, 2)
+      assert_equal 1, jobs.size
     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

@@ -0,0 +1,16 @@
+require_relative 'helper'
+
+class TestUtil < Sidekiq::Test
+
+  class Helpers
+    include Sidekiq::Util
+  end
+
+  def test_hertz_donut
+    obj = Helpers.new
+    output = capture_logging(Logger::DEBUG) do
+      assert_equal false, obj.want_a_hertz_donut?
+    end
+    assert_includes output, "hz: 10"
+  end
+end

data/test/test_web.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 require_relative 'helper'
-require 'sidekiq'
 require 'sidekiq/web'
 require 'rack/test'
+require 'tilt/erubis'
 
 class TestWeb < Sidekiq::Test
 
@@ -18,7 +18,6 @@ class TestWeb < Sidekiq::Test
     end
 
     before do
-      Sidekiq.redis = REDIS
       Sidekiq.redis {|c| c.flushdb }
     end
 
@@ -40,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
@@ -292,7 +300,13 @@ class TestWeb < Sidekiq::Test
 
       get '/queues/default'
       assert_equal 200, last_response.status
-      assert_match /#{msg['args'][2]}/, last_response.body
+      assert_match(/#{msg['args'][2]}/, last_response.body)
+    end
+
+    it 'calls updatePage() once when polling' do
+      get '/busy?poll=true'
+      assert_equal 200, last_response.status
+      assert_equal 1, last_response.body.scan('updatePage(').count
     end
 
     it 'escape job args and error messages' do
@@ -355,19 +369,24 @@ class TestWeb < Sidekiq::Test
       assert_equal 200, last_response.status
     end
 
-    Sidekiq::Web.settings.locales << File.join(File.dirname(__FILE__), "fixtures")
-    it 'can show user defined tab with custom locales' do
-      begin
+    describe 'custom locales' do
+      before do
+        Sidekiq::Web.settings.locales << File.join(File.dirname(__FILE__), "fixtures")
         Sidekiq::Web.tabs['Custom Tab'] = '/custom'
         Sidekiq::Web.get('/custom') do
+          clear_caches # ugly hack since I can't figure out how to access WebHelpers outside of this context
           t('translated_text')
         end
+      end
+
+      after do
+        Sidekiq::Web.tabs.delete 'Custom Tab'
+        Sidekiq::Web.settings.locales.pop
+      end
 
+      it 'can show user defined tab with custom locales' do
         get '/custom'
         assert_match(/Changed text/, last_response.body)
-
-      ensure
-        Sidekiq::Web.tabs.delete 'Custom Tab'
       end
     end
 

data/test/test_web_helpers.rb

@@ -1,6 +1,4 @@
 require_relative 'helper'
-require 'sidekiq'
-require 'sidekiq/web_helpers'
 
 class TestWebHelpers < Sidekiq::Test
 
@@ -43,6 +41,9 @@ class TestWebHelpers < Sidekiq::Test
     obj = Helpers.new('HTTP_ACCEPT_LANGUAGE' => 'zh-CN,zh;q=0.8,en-US;q=0.6,en;q=0.4,ru;q=0.2')
     assert_equal 'zh-cn', obj.locale
 
+    obj = Helpers.new('HTTP_ACCEPT_LANGUAGE' => 'nb-NO,nb;q=0.2')
+    assert_equal 'nb', obj.locale
+
     obj = Helpers.new('HTTP_ACCEPT_LANGUAGE' => 'en-us; *')
     assert_equal 'en', obj.locale
 

data/web/assets/javascripts/application.js

@@ -58,9 +58,14 @@ function updatePage(url) {
       url: url,
       dataType: 'html'
     }).done(function (data) {
-      var $page = $(data).filter('#page')
+      $data = $(data)
+
+      var $page = $data.filter('#page')
       $('#page').replaceWith($page)
 
+      var $header_status = $data.find('.status')
+      $('.status').replaceWith($header_status)
+
       $("time").timeago()
     })
   }, parseInt(localStorage.timeInterval) || 2000);

data/web/assets/javascripts/dashboard.js

@@ -227,14 +227,8 @@ var updateRedisStats = function(data) {
 }
 
 var pulseBeacon = function(){
-  $beacon = $('.beacon')
-  $beacon.find('.dot').addClass('pulse').delay(1000).queue(function(){
-    $(this).removeClass('pulse');
-    $(this).dequeue();
-  });
-  $beacon.find('.ring').addClass('pulse').delay(1000).queue(function(){
-    $(this).removeClass('pulse');
-    $(this).dequeue();
+  $('.beacon').addClass('pulse').delay(1000).queue(function(){
+    $(this).removeClass('pulse').dequeue();
   });
 }
 

data/web/assets/javascripts/locales/jquery.timeago.pt-br.js

@@ -1,16 +1,16 @@
-// Brazilian Portuguese 
+// Brasilian Portuguese
 jQuery.timeago.settings.strings = {
    suffixAgo: "atrás",
-   suffixFromNow: "nesse momento",
-   seconds: "alguns segundos",
-   minute: "há um minuto",
-   minutes: "há %d minutos",
-   hour: "há uma hora",
-   hours: "há %d horas",
-   day: "há um dia",
-   days: "há %d dias",
-   month: "há um mês",
-   months: "há %d meses",
-   year: "há um ano",
-   years: "há %d anos"
-};
+   suffixFromNow: "a partir de agora",
+   seconds: "menos de um minuto",
+   minute: "cerca de um minuto",
+   minutes: "%d minutos",
+   hour: "cerca de uma hora",
+   hours: "cerca de %d horas",
+   day: "um dia",
+   days: "%d dias",
+   month: "cerca de um mês",
+   months: "%d meses",
+   year: "cerca de um ano",
+   years: "%d anos"
+};