sidekiq-cron 1.2.0 → 1.5.0

data/lib/sidekiq/cron/locales/pt.yml

@@ -0,0 +1,22 @@
+pt:
+  Job: Tarefa
+  Cron: Cron
+  CronJobs: Tarefas do Cron
+  EnqueueNow: Enfileirar agora
+  EnableAll: Habilitar todos
+  DisableAll: Desabilitar todos
+  EnqueueAll: Enfileirar todos
+  DeleteAll: Excluir todos
+  'Cron string': Cron
+  AreYouSureEnqueueCronJobs: Tem certeza de que deseja enfileirar TODOS as tarefas?
+  AreYouSureEnqueueCronJob: Tem certeza de que deseja enfileirar a tarefa %{job}?
+  AreYouSureDeleteCronJobs: Tem certeza de que deseja excluir TODOS as tarefas?
+  AreYouSureDeleteCronJob: Tem certeza de que deseja excluir a tarefa %{job}?
+  NoCronJobsWereFound: Nenhuma tarefa foi encontrada
+  Enable: Habilitar
+  Disable: Desabilitar
+  'Last enqueued': Último enfileirado
+  disabled: desabilitado
+  enabled: habilitado
+  NoHistoryWereFound: Nenhum histórico foi encontrado
+  Description: Descrição

data/lib/sidekiq/cron/poller.rb

@@ -1,5 +1,4 @@
 require 'sidekiq'
-require 'sidekiq/util'
 require 'sidekiq/cron'
 require 'sidekiq/scheduled'
 
@@ -9,6 +8,19 @@ module Sidekiq
 
     # The Poller checks Redis every N seconds for sheduled cron jobs
     class Poller < Sidekiq::Scheduled::Poller
+      def initialize
+        Sidekiq.configure_server do |config|
+          config[:poll_interval_average] = config[:average_scheduled_poll_interval] || POLL_INTERVAL
+        end
+
+        if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("6.5.0")
+          # Sidekiq Poller init requires a config argument
+          super(Sidekiq)
+        else
+          super
+        end
+      end
+
       def enqueue
         time = Time.now.utc
         Sidekiq::Cron::Job.all.each do |job|
@@ -32,10 +44,6 @@ module Sidekiq
         Sidekiq.logger.error "CRON JOB: #{ex.backtrace.first}"
         handle_exception(ex) if respond_to?(:handle_exception)
       end
-
-      def poll_interval_average
-         Sidekiq.options[:poll_interval] || POLL_INTERVAL
-      end
     end
   end
 end

data/lib/sidekiq/cron/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Sidekiq
+  module Cron
+    VERSION = "1.5.0"
+  end
+end

data/lib/sidekiq/cron/views/cron.erb

@@ -1,24 +1,24 @@
 <header class='row'>
   <div class='col-sm-5 pull-left'>
-    <h3><%=t 'CronJobs' %></h3>
+    <h3><%= t('CronJobs') %></h3>
   </div>
   <div class='col-sm-7 pull-right' style="margin-top: 20px; margin-bottom: 10px;">
     <% if @cron_jobs.size > 0 %>
       <form action="<%= root_path %>cron/__all__/delete" method="post" class="pull-right">
         <%= csrf_tag if respond_to?(:csrf_tag) %>
-        <input class="btn btn-small btn-danger" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSureDeleteCronJobs') %>">
+        <input class="btn btn-danger" type="submit" name="delete" value="<%= t('DeleteAll') %>" data-confirm="<%= t('AreYouSureDeleteCronJobs') %>" />
       </form>
       <form action="<%= root_path %>cron/__all__/disable" method="post" class="pull-right">
         <%= csrf_tag if respond_to?(:csrf_tag) %>
-        <input class="btn btn-small" type="submit" name="enque" value="<%= t('DisableAll') %>" />
+        <input class="btn btn-warn" type="submit" name="enque" value="<%= t('DisableAll') %>" />
       </form>
       <form action="<%= root_path %>cron/__all__/enable" method="post" class="pull-right">
         <%= csrf_tag if respond_to?(:csrf_tag) %>
-        <input class="btn btn-small" type="submit" name="enque" value="<%= t('EnableAll') %>" />
+        <input class="btn btn-warn" type="submit" name="enque" value="<%= t('EnableAll') %>" />
       </form>
       <form action="<%= root_path %>cron/__all__/enque" method="post" class="pull-right">
         <%= csrf_tag if respond_to?(:csrf_tag) %>
-        <input class="btn btn-small" type="submit" name="enque" value="<%= t('EnqueueAll') %>" />
+        <input class="btn btn-warn" type="submit" name="enque" value="<%= t('EnqueueAll') %>" data-confirm="<%= t('AreYouSureEnqueueCronJobs') %>" />
       </form>
     <% end %>
   </div>
@@ -37,7 +37,7 @@
 
     <tbody>
       <% @cron_jobs.sort{|a,b| a.sort_name <=> b.sort_name }.each_with_index do |job, index| %>
-        <% style = "#{job.status == 'disabled' ? "background: #ecc": ""}" %>
+        <% style = "#{job.status == 'disabled' ? "background: #ecc; color: #585454;": ""}" %>
         <tr>
           <td style="<%= style %>"><%= t job.status %></td>
           <td style="<%= style %>">
@@ -47,9 +47,15 @@
             <hr style="margin:3px;border:0;">
             <small>
             <% if job.message and job.message.to_s.size > 100 %>
-              <button data-toggle="collapse" data-target=".worker_<%= index %>" class="btn btn-xs"><%= t('ShowAll')%></button>
-              <div class="toggle worker_<%= index %>" style="display: inline;"><%= job.message[0..100] + "... " %></div>
-              <div class="toggle worker_<%= index %>" style="display: none;"><%= job.message %></div>
+              <% if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("6.3.0") %>
+                <button data-toggle="job_<%= index %>" class="btn btn-warn btn-xs"><%= t('ShowAll')%></button>
+                <div class="toggle" id="job_<%= index %>" style="display: inline;"><%= job.message[0..100] + "... " %></div>
+                <div class="toggle" id="job_<%= index %>_full" style="display: none;"><%= job.message %></div>
+              <% else %>
+                <button data-toggle="collapse" data-target=".worker_<%= index %>" class="btn btn-warn btn-xs"><%= t('ShowAll')%></button>
+                <div class="toggle worker_<%= index %>" style="display: inline;"><%= job.message[0..100] + "... " %></div>
+                <div class="toggle worker_<%= index %>" style="display: none;"><%= job.message %></div>
+              <% end %>
             <% else %>
               <%= job.message %>
             <% end %>
@@ -61,20 +67,20 @@
             <% if job.status == 'enabled' %>
               <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/enque" method="post">
                 <%= csrf_tag if respond_to?(:csrf_tag) %>
-                <input class='btn btn-xs pull-left' type="submit" name="enque" value="<%= t('EnqueueNow') %>"/>
+                <input class='btn btn-warn btn-xs pull-left' type="submit" name="enque" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => job.name) %>"/>
               </form>
               <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/disable" method="post">
                 <%= csrf_tag if respond_to?(:csrf_tag) %>
-                <input class='btn btn-xs pull-left' type="submit" name="disable" value="<%= t('Disable') %>"/>
+                <input class='btn btn-warn btn-xs pull-left' type="submit" name="disable" value="<%= t('Disable') %>"/>
               </form>
             <% else %>
               <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/enque" method="post">
                 <%= csrf_tag if respond_to?(:csrf_tag) %>
-                <input class='btn btn-xs pull-left' type="submit" name="enque" value="<%= t('EnqueueNow') %>"/>
+                <input class='btn btn-warn btn-xs pull-left' type="submit" name="enque" value="<%= t('EnqueueNow') %>"/>
               </form>
               <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/enable" method="post">
                 <%= csrf_tag if respond_to?(:csrf_tag) %>
-                <input class='btn btn-xs pull-left' type="submit" name="enable" value="<%= t('Enable') %>"/>
+                <input class='btn btn-warn btn-xs pull-left' type="submit" name="enable" value="<%= t('Enable') %>"/>
               </form>
               <form action="<%= root_path %>cron/<%= CGI.escape(job.name).gsub('+', '%20') %>/delete" method="post">
                 <%= csrf_tag if respond_to?(:csrf_tag) %>

data/lib/sidekiq/cron/views/cron_show.erb

@@ -7,23 +7,23 @@
   </div>
   <div class="span col-sm-7 pull-right" style="margin-top: 20px; margin-bottom: 10px;">
     <% cron_job_path = "#{root_path}cron/#{CGI.escape(@job.name).gsub('+', '%20')}" %>
-    <form action="<%= cron_job_path %>/enque?redirect=<%= cron_job_path %>" class="pull-right" method="post">
+    <form action="<%= cron_job_path %>/enque?redirect=<%= cron_job_path %>" method="post">
       <%= csrf_tag if respond_to?(:csrf_tag) %>
-      <input class="btn btn-small pull-left" name="enque" type="submit" value="<%= t('EnqueueNow') %>" />
+      <input class="btn btn-warn pull-left" name="enque" type="submit" value="<%= t('EnqueueNow') %>" data-confirm="<%= t('AreYouSureEnqueueCronJob', :job => @job.name) %>" />
     </form>
     <% if @job.status == 'enabled' %>
-      <form action="<%= cron_job_path %>/disable?redirect=<%= cron_job_path %>" class="pull-right" method="post">
+      <form action="<%= cron_job_path %>/disable?redirect=<%= cron_job_path %>" method="post">
         <%= csrf_tag if respond_to?(:csrf_tag) %>
-        <input class="btn btn-small pull-left" name="disable" type="submit" value="<%= t('Disable') %>" />
+        <input class="btn btn-warn pull-left" name="disable" type="submit" value="<%= t('Disable') %>" />
       </form>
     <% else %>
-      <form action="<%= cron_job_path %>/enable?redirect=<%= cron_job_path %>" class="pull-right" method="post">
+      <form action="<%= cron_job_path %>/enable?redirect=<%= cron_job_path %>" method="post">
         <%= csrf_tag if respond_to?(:csrf_tag) %>
-        <input class="btn btn-small pull-left" name="enable" type="submit" value="<%= t('Enable') %>" />
+        <input class="btn btn-warn pull-left" name="enable" type="submit" value="<%= t('Enable') %>" />
       </form>
-      <form action="<%= cron_job_path %>/delete" class="pull-right" method="post">
+      <form action="<%= cron_job_path %>/delete" method="post">
         <%= csrf_tag if respond_to?(:csrf_tag) %>
-        <input class="btn btn-danger btn-small" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => @job.name) %>" name="delete" type="submit" value="<%= t('Delete') %>" />
+        <input class="btn btn-danger" data-confirm="<%= t('AreYouSureDeleteCronJob', :job => @job.name) %>" name="delete" type="submit" value="<%= t('Delete') %>" />
       </form>
     <% end %>
   </div>

data/lib/sidekiq/cron/web.rb

@@ -3,11 +3,5 @@ require "sidekiq/cron/job"
 
 if defined?(Sidekiq::Web)
   Sidekiq::Web.register Sidekiq::Cron::WebExtension
-
-  if Sidekiq::Web.tabs.is_a?(Array)
-    # For sidekiq < 2.5
-    Sidekiq::Web.tabs << "cron"
-  else
-    Sidekiq::Web.tabs["Cron"] = "cron"
-  end
+  Sidekiq::Web.tabs["Cron"] = "cron"
 end

data/lib/sidekiq/cron/web_extension.rb

@@ -12,12 +12,7 @@ module Sidekiq
 
           @cron_jobs = Sidekiq::Cron::Job.all
 
-          #if Slim renderer exists and sidekiq has layout.slim in views
-          if defined?(Slim) && File.exists?(File.join(settings.views,"layout.slim"))
-            render(:slim, File.read(File.join(view_path, "cron.slim")))
-          else
-            render(:erb, File.read(File.join(view_path, "cron.erb")))
-          end
+          render(:erb, File.read(File.join(view_path, "cron.erb")))
         end
 
         # display job detail + jid history
@@ -26,12 +21,7 @@ module Sidekiq
 
           @job = Sidekiq::Cron::Job.find(route_params[:name])
           if @job
-            #if Slim renderer exists and sidekiq has layout.slim in views
-            if defined?(Slim) && File.exists?(File.join(settings.views,"layout.slim"))
-              render(:slim, File.read(File.join(view_path, "cron_show.slim")))
-            else
-              render(:erb, File.read(File.join(view_path, "cron_show.erb")))
-            end
+            render(:erb, File.read(File.join(view_path, "cron_show.erb")))
           else
             redirect "#{root_path}cron"
           end

data/sidekiq-cron.gemspec

@@ -1,129 +1,41 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: sidekiq-cron 1.2.0 ruby lib
+# frozen_string_literal: true
+
+require './lib/sidekiq/cron/version'
 
 Gem::Specification.new do |s|
-  s.name = "sidekiq-cron".freeze
-  s.version = "1.2.0"
+  s.name = "sidekiq-cron"
+  s.version = Sidekiq::Cron::VERSION
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib".freeze]
-  s.authors = ["Ondrej Bartas".freeze]
-  s.date = "2020-04-03"
-  s.description = "Enables to set jobs to be run in specified time (using CRON notation)".freeze
-  s.email = "ondrej@bartas.cz".freeze
+  s.required_ruby_version = ">= 2.6"
+  s.require_paths = ["lib"]
+  s.authors = ["Ondrej Bartas"]
+  s.description = "Enables to set jobs to be run in specified time (using CRON notation)"
+  s.email = "ondrej@bartas.cz"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
   ]
-  s.files = [
-    ".document",
-    ".travis.yml",
+  s.files = Dir.glob('lib/**/*') + Dir.glob('test/**/*') + [
     "Changes.md",
-    "Dockerfile",
     "Gemfile",
     "LICENSE.txt",
-    "README.md",
     "Rakefile",
-    "VERSION",
-    "config.ru",
-    "docker-compose.yml",
-    "examples/web-cron-ui.png",
-    "lib/sidekiq-cron.rb",
-    "lib/sidekiq/cron.rb",
-    "lib/sidekiq/cron/job.rb",
-    "lib/sidekiq/cron/launcher.rb",
-    "lib/sidekiq/cron/locales/de.yml",
-    "lib/sidekiq/cron/locales/en.yml",
-    "lib/sidekiq/cron/locales/ja.yml",
-    "lib/sidekiq/cron/locales/ru.yml",
-    "lib/sidekiq/cron/locales/zh-CN.yml",
-    "lib/sidekiq/cron/poller.rb",
-    "lib/sidekiq/cron/support.rb",
-    "lib/sidekiq/cron/views/cron.erb",
-    "lib/sidekiq/cron/views/cron.slim",
-    "lib/sidekiq/cron/views/cron_show.erb",
-    "lib/sidekiq/cron/views/cron_show.slim",
-    "lib/sidekiq/cron/web.rb",
-    "lib/sidekiq/cron/web_extension.rb",
+    "README.md",
     "sidekiq-cron.gemspec",
-    "test/integration/performance_test.rb",
-    "test/test_helper.rb",
-    "test/unit/job_test.rb",
-    "test/unit/poller_test.rb",
-    "test/unit/web_extension_test.rb"
   ]
-  s.homepage = "http://github.com/ondrejbartas/sidekiq-cron".freeze
-  s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.5.2.3".freeze
-  s.summary = "Sidekiq Cron helps to add repeated scheduled jobs".freeze
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  s.homepage = "https://github.com/ondrejbartas/sidekiq-cron"
+  s.licenses = ["MIT"]
+  s.summary = "Sidekiq-Cron helps to add repeated scheduled jobs"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sidekiq>.freeze, [">= 4.2.1"])
-      s.add_runtime_dependency(%q<fugit>.freeze, ["~> 1.1"])
-      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_development_dependency(%q<redis-namespace>.freeze, [">= 1.5.2"])
-      s.add_development_dependency(%q<shoulda-context>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rack>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rack-test>.freeze, [">= 0"])
-      s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
-      s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
-      s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
-      s.add_development_dependency(%q<sdoc>.freeze, [">= 0"])
-      s.add_development_dependency(%q<slim>.freeze, [">= 0"])
-      s.add_development_dependency(%q<sinatra>.freeze, [">= 0"])
-      s.add_development_dependency(%q<mocha>.freeze, [">= 0"])
-      s.add_development_dependency(%q<coveralls>.freeze, [">= 0"])
-      s.add_development_dependency(%q<shotgun>.freeze, [">= 0"])
-      s.add_development_dependency(%q<guard>.freeze, [">= 0"])
-      s.add_development_dependency(%q<guard-minitest>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<sidekiq>.freeze, [">= 4.2.1"])
-      s.add_dependency(%q<fugit>.freeze, ["~> 1.1"])
-      s.add_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_dependency(%q<redis-namespace>.freeze, [">= 1.5.2"])
-      s.add_dependency(%q<shoulda-context>.freeze, [">= 0"])
-      s.add_dependency(%q<rack>.freeze, [">= 0"])
-      s.add_dependency(%q<rack-test>.freeze, [">= 0"])
-      s.add_dependency(%q<jeweler>.freeze, [">= 0"])
-      s.add_dependency(%q<minitest>.freeze, [">= 0"])
-      s.add_dependency(%q<test-unit>.freeze, [">= 0"])
-      s.add_dependency(%q<sdoc>.freeze, [">= 0"])
-      s.add_dependency(%q<slim>.freeze, [">= 0"])
-      s.add_dependency(%q<sinatra>.freeze, [">= 0"])
-      s.add_dependency(%q<mocha>.freeze, [">= 0"])
-      s.add_dependency(%q<coveralls>.freeze, [">= 0"])
-      s.add_dependency(%q<shotgun>.freeze, [">= 0"])
-      s.add_dependency(%q<guard>.freeze, [">= 0"])
-      s.add_dependency(%q<guard-minitest>.freeze, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<sidekiq>.freeze, [">= 4.2.1"])
-    s.add_dependency(%q<fugit>.freeze, ["~> 1.1"])
-    s.add_dependency(%q<bundler>.freeze, [">= 0"])
-    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-    s.add_dependency(%q<redis-namespace>.freeze, [">= 1.5.2"])
-    s.add_dependency(%q<shoulda-context>.freeze, [">= 0"])
-    s.add_dependency(%q<rack>.freeze, [">= 0"])
-    s.add_dependency(%q<rack-test>.freeze, [">= 0"])
-    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
-    s.add_dependency(%q<minitest>.freeze, [">= 0"])
-    s.add_dependency(%q<test-unit>.freeze, [">= 0"])
-    s.add_dependency(%q<sdoc>.freeze, [">= 0"])
-    s.add_dependency(%q<slim>.freeze, [">= 0"])
-    s.add_dependency(%q<sinatra>.freeze, [">= 0"])
-    s.add_dependency(%q<mocha>.freeze, [">= 0"])
-    s.add_dependency(%q<coveralls>.freeze, [">= 0"])
-    s.add_dependency(%q<shotgun>.freeze, [">= 0"])
-    s.add_dependency(%q<guard>.freeze, [">= 0"])
-    s.add_dependency(%q<guard-minitest>.freeze, [">= 0"])
-  end
-end
+  s.add_dependency("fugit", "~> 1")
+  s.add_dependency("sidekiq", ">= 4.2.1")
 
+  s.add_development_dependency("minitest", "~> 5.15")
+  s.add_development_dependency("mocha", "~> 1.14")
+  s.add_development_dependency("redis-namespace", "~> 1.8")
+  s.add_development_dependency("rack", "~> 2.2")
+  s.add_development_dependency("rack-test", "~> 1.1")
+  s.add_development_dependency("rake", "~> 13.0")
+  s.add_development_dependency("simplecov", "~> 0.21")
+end

data/test/integration/performance_test.rb

@@ -1,12 +1,11 @@
-# -*- encoding : utf-8 -*-
 require './test/test_helper'
 require 'benchmark'
 
 describe 'Performance Poller' do
   X = 10000
   before do
+    REDIS.with { |c| c.respond_to?(:redis) ? c.redis.flushdb : c.flushdb }
     Sidekiq.redis = REDIS
-    Redis.current.flushdb
 
     #clear all previous saved data from redis
     Sidekiq.redis do |conn|
@@ -31,7 +30,7 @@ describe 'Performance Poller' do
     Time.stubs(:now).returns(enqueued_time)
   end
 
-  it 'should enqueue 10000 jobs in less than 40s' do
+  it 'should enqueue 10000 jobs in less than 50s' do
     Sidekiq.redis do |conn|
       assert_equal 0, conn.llen("queue:default"), 'Queue should be empty'
     end
@@ -45,6 +44,6 @@ describe 'Performance Poller' do
     end
 
     puts "Performance test finished in #{bench.real}"
-    assert_operator bench.real, :<, 40
+    assert_operator bench.real, :<, 50
   end
 end

data/test/test_helper.rb

@@ -1,37 +1,21 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+$TESTING = true
+ENV['RACK_ENV'] = 'test'
 
 require 'simplecov'
 SimpleCov.start do
   add_filter "/test/"
-
   add_group 'SidekiqCron', 'lib/'
 end
-require 'coveralls'
-Coveralls.wear!
 
 require "minitest/autorun"
-require 'shoulda-context'
 require "rack/test"
 require 'mocha/minitest'
-
-ENV['RACK_ENV'] = 'test'
-
-#SIDEKIQ Require - need to have sidekiq running!
 require 'sidekiq'
-require 'sidekiq/util'
+require "sidekiq-pro" if ENV['SIDEKIQ_PRO_VERSION']
 require 'sidekiq/web'
 
 Sidekiq.logger.level = Logger::ERROR
 
-require 'sidekiq/redis_connection'
 redis_url = ENV['REDIS_URL'] || 'redis://0.0.0.0:6379'
 REDIS = Sidekiq::RedisConnection.create(:url => redis_url, :namespace => 'testy')
 
@@ -39,12 +23,15 @@ Sidekiq.configure_client do |config|
   config.redis = { :url => redis_url, :namespace => 'testy' }
 end
 
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'sidekiq-cron'
 require 'sidekiq/cron/web'
-require 'pp'
+
+# For testing os symbilize args!
+class Hash
+  def symbolize_keys
+    transform_keys { |key| key.to_sym rescue key }
+  end
+end
 
 class CronTestClass
   include Sidekiq::Worker

data/test/unit/job_test.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require './test/test_helper'
 
 describe "Cron Job" do
@@ -363,6 +362,108 @@ describe "Cron Job" do
     end
   end
 
+  describe '#active_job_message - unknown Active Job Worker class' do
+    before do
+      SecureRandom.stubs(:uuid).returns('XYZ')
+      ActiveJob::Base.queue_name_prefix = ''
+
+      @args = {
+        name:  'Test',
+        cron:  '* * * * *',
+        klass: 'UnknownActiveJobCronTestClass',
+        active_job: true,
+        queue: 'super_queue',
+        description: nil,
+        args:  { foo: 'bar' }
+      }
+      @job = Sidekiq::Cron::Job.new(@args)
+    end
+
+    it 'should return valid payload for Sidekiq::Client' do
+      payload = {
+        'class'       => 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper',
+        'wrapped'     => 'UnknownActiveJobCronTestClass',
+        'queue'       => 'super_queue',
+        'description' => nil,
+        'args'        => [{
+          'job_class'  => 'UnknownActiveJobCronTestClass',
+          'job_id'     => 'XYZ',
+          'queue_name' => 'super_queue',
+          'arguments'  => [{foo: 'bar'}]
+        }]
+      }
+      assert_equal @job.active_job_message, payload
+    end
+  end
+
+  describe '#active_job_message with symbolize_args (hash)' do
+    before do
+      SecureRandom.stubs(:uuid).returns('XYZ')
+      ActiveJob::Base.queue_name_prefix = ''
+
+      @args = {
+        name:  'Test',
+        cron:  '* * * * *',
+        klass: 'ActiveJobCronTestClass',
+        queue: 'super_queue',
+        description: nil,
+        symbolize_args: true,
+        args: { 'foo' => 'bar' }
+      }
+      @job = Sidekiq::Cron::Job.new(@args)
+    end
+
+    it 'should return valid payload for Sidekiq::Client' do
+      payload = {
+        'class'       => 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper',
+        'wrapped'     => 'ActiveJobCronTestClass',
+        'queue'       => 'super_queue',
+        'description' => nil,
+        'args'        => [{
+          'job_class'  => 'ActiveJobCronTestClass',
+          'job_id'     => 'XYZ',
+          'queue_name' => 'super_queue',
+          'arguments'  => [{foo: 'bar'}]
+        }]
+      }
+      assert_equal @job.active_job_message, payload
+    end
+  end
+
+  describe '#active_job_message with symbolize_args (array)' do
+    before do
+      SecureRandom.stubs(:uuid).returns('XYZ')
+      ActiveJob::Base.queue_name_prefix = ''
+
+      @args = {
+        name:  'Test',
+        cron:  '* * * * *',
+        klass: 'ActiveJobCronTestClass',
+        queue: 'super_queue',
+        description: nil,
+        symbolize_args: true,
+        args: [{ 'foo' => 'bar' }]
+      }
+      @job = Sidekiq::Cron::Job.new(@args)
+    end
+
+    it 'should return valid payload for Sidekiq::Client' do
+      payload = {
+        'class'       => 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper',
+        'wrapped'     => 'ActiveJobCronTestClass',
+        'queue'       => 'super_queue',
+        'description' => nil,
+        'args'        => [{
+          'job_class'  => 'ActiveJobCronTestClass',
+          'job_id'     => 'XYZ',
+          'queue_name' => 'super_queue',
+          'arguments'  => [{foo: 'bar'}]
+        }]
+      }
+      assert_equal @job.active_job_message, payload
+    end
+  end
+
   describe '#active_job_message with queue_name_prefix' do
     before do
       SecureRandom.stubs(:uuid).returns('XYZ')
@@ -827,11 +928,11 @@ describe "Cron Job" do
         cron: "* * * * *",
         klass: "CronTestClass"
       }
-      #first time is allways
+      #first time is always
       #after next cron time!
       @time = Time.now.utc + 120
     end
-    it "be allways false when status is disabled" do
+    it "be always false when status is disabled" do
       refute Sidekiq::Cron::Job.new(@args.merge(status: 'disabled')).should_enque? @time
       refute Sidekiq::Cron::Job.new(@args.merge(status: 'disabled')).should_enque? @time - 60
       refute Sidekiq::Cron::Job.new(@args.merge(status: 'disabled')).should_enque? @time - 120
@@ -1018,7 +1119,6 @@ describe "Cron Job" do
 
         assert_equal Sidekiq::Cron::Job.all.first.sidekiq_worker_message, payload
       end
-
     end
   end
 end

data/test/unit/poller_test.rb

@@ -1,11 +1,9 @@
-# -*- encoding : utf-8 -*-
 require './test/test_helper'
 
-
 describe 'Cron Poller' do
   before do
+    REDIS.with { |c| c.respond_to?(:redis) ? c.redis.flushdb : c.flushdb }
     Sidekiq.redis = REDIS
-    Redis.current.flushdb
 
     #clear all previous saved data from redis
     Sidekiq.redis do |conn|