sidekiq 2.14.1 → 2.15.0

data/test/test_testing_fake.rb

@@ -0,0 +1,265 @@
+require 'helper'
+require 'sidekiq'
+require 'sidekiq/worker'
+require 'active_record'
+require 'action_mailer'
+require 'sidekiq/rails'
+require 'sidekiq/extensions/action_mailer'
+require 'sidekiq/extensions/active_record'
+
+Sidekiq.hook_rails!
+
+class TestTesting < Sidekiq::Test
+  describe 'sidekiq testing' do
+    class PerformError < RuntimeError; end
+
+    class DirectWorker
+      include Sidekiq::Worker
+      def perform(a, b)
+        a + b
+      end
+    end
+
+    class EnqueuedWorker
+      include Sidekiq::Worker
+      def perform(a, b)
+        a + b
+      end
+    end
+
+    class StoredWorker
+      include Sidekiq::Worker
+      def perform(error)
+        raise PerformError if error
+      end
+    end
+
+    class FooMailer < ActionMailer::Base
+      def bar(str)
+        str
+      end
+    end
+
+    class FooModel < ActiveRecord::Base
+      def bar(str)
+        str
+      end
+    end
+
+    before do
+      require 'sidekiq/testing.rb'
+      Sidekiq::Testing.fake!
+      EnqueuedWorker.jobs.clear
+      DirectWorker.jobs.clear
+    end
+
+    after do
+      Sidekiq::Testing.disable!
+    end
+
+    it 'stubs the async call' do
+      assert_equal 0, DirectWorker.jobs.size
+      assert DirectWorker.perform_async(1, 2)
+      assert_equal 1, DirectWorker.jobs.size
+      assert DirectWorker.perform_in(10, 1, 2)
+      assert_equal 2, DirectWorker.jobs.size
+      assert DirectWorker.perform_at(10, 1, 2)
+      assert_equal 3, DirectWorker.jobs.size
+      assert_in_delta 10.seconds.from_now.to_f, DirectWorker.jobs.last['at'], 0.01
+    end
+
+    it 'stubs the delay call on mailers' do
+      assert_equal 0, Sidekiq::Extensions::DelayedMailer.jobs.size
+      FooMailer.delay.bar('hello!')
+      assert_equal 1, Sidekiq::Extensions::DelayedMailer.jobs.size
+    end
+
+    class Something
+      def self.foo(x)
+      end
+    end
+
+    it 'stubs the delay call on models' do
+      assert_equal 0, Sidekiq::Extensions::DelayedClass.jobs.size
+      Something.delay.foo(Date.today)
+      assert_equal 1, Sidekiq::Extensions::DelayedClass.jobs.size
+    end
+
+    it 'stubs the enqueue call' do
+      assert_equal 0, EnqueuedWorker.jobs.size
+      assert Sidekiq::Client.enqueue(EnqueuedWorker, 1, 2)
+      assert_equal 1, EnqueuedWorker.jobs.size
+    end
+
+    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
+    end
+
+    it 'executes all stored jobs' do
+      assert StoredWorker.perform_async(false)
+      assert StoredWorker.perform_async(true)
+
+      assert_equal 2, StoredWorker.jobs.size
+      assert_raises PerformError do
+        StoredWorker.drain
+      end
+      assert_equal 0, StoredWorker.jobs.size
+
+    end
+
+    class SpecificJidWorker
+      include Sidekiq::Worker
+      class_attribute :count
+      self.count = 0
+      def perform(worker_jid)
+        return unless worker_jid == self.jid
+        self.class.count += 1
+      end
+    end
+
+    it 'execute only jobs with assigned JID' do
+      4.times do |i|
+        jid = SpecificJidWorker.perform_async(nil)
+        if i % 2 == 0
+          SpecificJidWorker.jobs[-1]["args"] = ["wrong_jid"]
+        else
+          SpecificJidWorker.jobs[-1]["args"] = [jid]
+        end
+      end
+
+      SpecificJidWorker.perform_one
+      assert_equal 0, SpecificJidWorker.count
+
+      SpecificJidWorker.perform_one
+      assert_equal 1, SpecificJidWorker.count
+
+      SpecificJidWorker.drain
+      assert_equal 2, SpecificJidWorker.count
+    end
+
+    it 'round trip serializes the job arguments' do
+      assert StoredWorker.perform_async(:mike)
+      job = StoredWorker.jobs.first
+      assert_equal "mike", job['args'].first
+      StoredWorker.clear
+    end
+
+    it 'perform_one runs only one job' do
+      DirectWorker.perform_async(1, 2)
+      DirectWorker.perform_async(3, 4)
+      assert_equal 2, DirectWorker.jobs.size
+
+      DirectWorker.perform_one
+      assert_equal 1, DirectWorker.jobs.size
+
+      DirectWorker.clear
+    end
+
+    it 'perform_one raise error upon empty queue' do
+      DirectWorker.clear
+      assert_raises Sidekiq::EmptyQueueError do
+        DirectWorker.perform_one
+      end
+    end
+
+    class FirstWorker
+      include Sidekiq::Worker
+      class_attribute :count
+      self.count = 0
+      def perform
+        self.class.count += 1
+      end
+    end
+
+    class SecondWorker
+      include Sidekiq::Worker
+      class_attribute :count
+      self.count = 0
+      def perform
+        self.class.count += 1
+      end
+    end
+
+    class ThirdWorker
+      include Sidekiq::Worker
+      class_attribute :count
+      def perform
+        FirstWorker.perform_async
+        SecondWorker.perform_async
+      end
+    end
+
+    it 'clears jobs across all workers' do
+      Sidekiq::Worker.jobs.clear
+      FirstWorker.count = 0
+      SecondWorker.count = 0
+
+      assert_equal 0, FirstWorker.jobs.size
+      assert_equal 0, SecondWorker.jobs.size
+
+      FirstWorker.perform_async
+      SecondWorker.perform_async
+
+      assert_equal 1, FirstWorker.jobs.size
+      assert_equal 1, SecondWorker.jobs.size
+
+      Sidekiq::Worker.clear_all
+
+      assert_equal 0, FirstWorker.jobs.size
+      assert_equal 0, SecondWorker.jobs.size
+
+      assert_equal 0, FirstWorker.count
+      assert_equal 0, SecondWorker.count
+    end
+
+    it 'drains jobs across all workers' do
+      Sidekiq::Worker.jobs.clear
+      FirstWorker.count = 0
+      SecondWorker.count = 0
+
+      assert_equal 0, FirstWorker.jobs.size
+      assert_equal 0, SecondWorker.jobs.size
+
+      assert_equal 0, FirstWorker.count
+      assert_equal 0, SecondWorker.count
+
+      FirstWorker.perform_async
+      SecondWorker.perform_async
+
+      assert_equal 1, FirstWorker.jobs.size
+      assert_equal 1, SecondWorker.jobs.size
+
+      Sidekiq::Worker.drain_all
+
+      assert_equal 0, FirstWorker.jobs.size
+      assert_equal 0, SecondWorker.jobs.size
+
+      assert_equal 1, FirstWorker.count
+      assert_equal 1, SecondWorker.count
+    end
+
+    it 'drains jobs across all workers even when workers create new jobs' do
+      Sidekiq::Worker.jobs.clear
+      FirstWorker.count = 0
+      SecondWorker.count = 0
+
+      assert_equal 0, ThirdWorker.jobs.size
+
+      assert_equal 0, FirstWorker.count
+      assert_equal 0, SecondWorker.count
+
+      ThirdWorker.perform_async
+
+      assert_equal 1, ThirdWorker.jobs.size
+
+      Sidekiq::Worker.drain_all
+
+      assert_equal 0, ThirdWorker.jobs.size
+
+      assert_equal 1, FirstWorker.count
+      assert_equal 1, SecondWorker.count
+    end
+  end
+end

data/test/test_testing_inline.rb

@@ -9,7 +9,7 @@ require 'sidekiq/extensions/active_record'
 
 Sidekiq.hook_rails!
 
-class TestInline < Minitest::Test
+class TestInline < Sidekiq::Test
   describe 'sidekiq inline testing' do
     class InlineError < RuntimeError; end
     class ParameterIsNotString < RuntimeError; end
@@ -41,15 +41,12 @@ class TestInline < Minitest::Test
     end
 
     before do
-      load 'sidekiq/testing/inline.rb'
+      require 'sidekiq/testing/inline.rb'
+      Sidekiq::Testing.inline!
     end
 
     after do
-      Sidekiq::Client.singleton_class.class_eval do
-        remove_method :raw_push
-        alias_method :raw_push, :raw_push_old
-        remove_method :raw_push_old
-      end
+      Sidekiq::Testing.disable!
     end
 
     it 'stubs the async call when in testing mode' do

data/test/test_util.rb

@@ -1,7 +1,7 @@
 require 'helper'
 require 'sidekiq/util'
 
-class TestUtil < Minitest::Test
+class TestUtil < Sidekiq::Test
   describe 'util' do
     it 'generates the same process id when included in two or more classes' do
       class One

data/test/test_web.rb

@@ -3,7 +3,7 @@ require 'sidekiq'
 require 'sidekiq/web'
 require 'rack/test'
 
-class TestWeb < Minitest::Test
+class TestWeb < Sidekiq::Test
   describe 'sidekiq web' do
     include Rack::Test::Methods
 

data/web/assets/javascripts/dashboard.js

@@ -6,7 +6,9 @@ n){return arguments.length?(t=+n,e):t},e.translate=function(t){return arguments.
 
 // Match width of graphs with summary bar
 var responsiveWidth = function() {
-  return document.getElementsByClassName('summary_bar')[0].clientWidth;
+  //Bootstrap now uses padding instead of margin for gutters. 30px (15 on each side)
+  //http://getbootstrap.com/css/#grid
+  return document.getElementsByClassName('summary_bar')[0].clientWidth - 30;
 };
 
 // Richshaw

data/web/assets/stylesheets/application.css

@@ -32,7 +32,7 @@ h1, h2, h3, h4, h5, h6, strong {
   font-weight: 700;
 }
 
-.brand, .navbar .brand, h5, h4, h3, h2, h1 {
+.navbar-brand, .navbar .navbar-brand, h5, h4, h3, h2, h1 {
   font-family: Armata;
   font-weight: 400;
 }
@@ -79,7 +79,7 @@ h3 {
 }
 
 .admin #page {
-  padding: 60px 0 40px 0;
+  padding: 60px 0;
 }
 
 .row.header .actions {
@@ -113,10 +113,15 @@ header.row .pagination {
   margin-bottom: 10px;
   border-width: 0px;
 }
-.summary_bar #live-poll {
-  line-height: 28px;
+.poll-wrapper {
+  padding: 9px 0 0 0;
 }
-.summary_bar #live-poll.active {
+.nav #live-poll {
+  height: 25px;
+  line-height: 25px;
+  width: 195px;
+}
+#live-poll.active {
   background-color: #009300;
 }
 .summary_bar ul {
@@ -144,21 +149,21 @@ header.row .pagination {
   }
 }
 @media (max-width: 979px) and (min-width: 768px) {
-  .summary_bar ul li.span2 {
+  .summary_bar ul li.col-sm-2 {
     margin: 0px 10px;
     width: 96px !important;
   }
 }
-@media (max-width: 1199px) and (min-width: 980px) {
-  .summary_bar ul li.span2 {
+/*@media (max-width: 1199px) and (min-width: 980px) {
+  .summary_bar ul li.col-sm-2 {
     width: 130px !important;
   }
 }
 @media (min-width: 1200px) {
-  .summary_bar ul li.span2 {
+  .summary_bar ul li.col-sm-2 {
     width: 154px !important;
   }
-}
+}*/
 .summary_bar ul .desc {
   display: block;
   font-size: 1em;
@@ -191,11 +196,16 @@ td form {
   margin-bottom: 0;
 }
 
-.navbar .brand {
+.navbar .navbar-brand {
   color: #b1003e;
+  padding: 13px;
   text-shadow: none;
 }
 
+.navbar .navbar-brand .status {
+  color: #585454;
+}
+
 .navbar-footer .navbar ul.nav {
   text-align: center;
   float: none;
@@ -206,7 +216,7 @@ td form {
   padding: 15px;
 }
 
-.navbar-footer .navbar ul.nav a.brand {
+.navbar-footer .navbar ul.nav a.navbar-brand {
   font-weight: 400;
   padding: 0 15px 0 0;
 }
@@ -232,16 +242,17 @@ img.smallogo {
 
 .status-sprite {
   background-image: url(../images/status-sd8051fd480.png);
-  height: 30px;
-  width: 30px;
+  height: 19px;
+  width: 20px;
   display: inline-block;
+  background-size: 20px;
 }
 .status-active {
   background-position: 0 0;
 }
 
 .status-idle {
-  background-position: 0 -80px;
+  background-position: 0 -54px;
 }
 
 .btn {
@@ -291,6 +302,15 @@ img.smallogo {
   padding: 10px 0;
 }
 
+.redis-wrapper {
+  width: 100%;
+  text-align: center;
+}
+
+.stats-container {
+  display: inline-block;
+}
+
 .stat {
   float: left;
   text-align: center;
@@ -301,10 +321,33 @@ img.smallogo {
   margin-bottom: 20px;
 }
 
+.stat:last-child {
+  margin-right: 0;
+}
+
 .stat p {
   font-size: 0.9em;
 }
-
+@media (max-width: 767px) {
+  .stats-container {
+    display: block;
+  }
+  .stat {
+    float: left;
+    margin-right: 10px;
+    width: 100%;
+    text-align: left;
+    line-height: 45px;
+  }
+  .stat h3{
+    float: right;
+    margin: 5px 10px 5px 5px;
+  }
+  .stat p{
+    font-size: normal;
+    margin: 5px 5px 5px 10px;
+  }
+}
 .beacon {
   position: relative;
   height: 20px;
@@ -482,13 +525,14 @@ img.smallogo {
   text-decoration: none;
 }
 
-@media (max-width: 550px) {
+@media (max-width: 768px) {
   .navbar .container {
     text-align: center
   }
 
-  .navbar .brand {
+  .navbar .navbar-brand {
     float: none;
+    display: block;
   }
 
   .navbar ul.nav li a {
@@ -506,6 +550,11 @@ img.smallogo {
     margin-right: 0;
   }
 
+  .poll-wrapper {
+    padding: 0px 20px 5px 0px;
+    width: 20%;
+  }
+
   .navbar.navbar-fixed-bottom ul {
     float: none;
     margin-right: 0;
@@ -517,6 +566,7 @@ img.smallogo {
   }
 
   .navbar-text {
+    float:none;
     line-height: 30px;
   }
 }
@@ -532,7 +582,7 @@ img.smallogo {
 }
 
 @media (max-width: 500px) {
-  .navbar-footer .navbar ul.nav a.brand {
+  .navbar-footer .navbar ul.nav a.navbar-brand {
     padding-right: 5px;
   }
 }
@@ -846,10 +896,23 @@ img.smallogo {
   border-radius: 3px;
 }
 .args {
-  overflow: scroll;
+  overflow-y: scroll;
   max-height: 100px;
 }
 .args-extended {
-  overflow: scroll;
+  overflow-y: scroll;
   max-height: 500px;
 }
+
+
+/* BOOTSTRAP 3 FIXES */
+/* @grid-float-breakpoint -1 */
+.container {
+  padding: 0;
+}
+@media (max-width: 979px) {
+    .navbar-fixed-top, .navbar-fixed-bottom {
+      position: relative;
+      top: auto;
+    }
+}