sidekiq-cron 1.2.0 → 1.3.0

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

@@ -1,12 +1,12 @@
 <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-small 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) %>
@@ -18,7 +18,7 @@
       </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-small" type="submit" name="enque" value="<%= t('EnqueueAll') %>" data-confirm="<%= t('AreYouSureEnqueueCronJobs') %>" />
       </form>
     <% end %>
   </div>
@@ -61,7 +61,7 @@
             <% 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-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) %>

data/lib/sidekiq/cron/views/cron.slim

@@ -15,7 +15,7 @@ header.row
         input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnableAll')}"
       form.pull-right action="#{root_path}cron/__all__/enque" method="post"
         = csrf_tag if respond_to?(:csrf_tag)
-        input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnqueueAll')}"
+        input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnqueueAll')}" data-confirm="#{t('AreYouSureEnqueueCronJobs')}"
 
 - if @cron_jobs.size > 0
 
@@ -59,7 +59,7 @@ header.row
           -else
             form action="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}/enque" method="post"
               = csrf_tag if respond_to?(:csrf_tag)
-              input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnqueueNow')}"
+              input.btn.btn-small.pull-left type="submit" name="enque" value="#{t('EnqueueNow')}" data-confirm="#{t('AreYouSureEnqueueCronJob', :job => job.name)}"
             form action="#{root_path}cron/#{CGI.escape(job.name).gsub('+', '%20')}/enable" method="post"
               = csrf_tag if respond_to?(:csrf_tag)
               input.btn.btn-small.pull-left type="submit" name="enable" value="#{t('Enable')}"

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

@@ -9,7 +9,7 @@
     <% 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">
       <%= 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-small 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">

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

@@ -7,7 +7,7 @@ header.row
     - cron_job_path = "#{root_path}cron/#{CGI.escape(@job.name).gsub('+', '%20')}"
     form.pull-right action="#{cron_job_path}/enque?redirect=#{cron_job_path}" method="post"
       = csrf_tag if respond_to?(:csrf_tag)
-      input.btn.btn-small.pull-left name="enque" type="submit" value="#{t('EnqueueNow')}"
+      input.btn.btn-small.pull-left data-confirm="#{t('AreYouSureEnqueueCronJob', :job => @job.name)}" name="enque" type="submit" value="#{t('EnqueueNow')}"
     - if @job.status == 'enabled'
       form.pull-right action="#{cron_job_path}/disable?redirect=#{cron_job_path}" method="post"
         = csrf_tag if respond_to?(:csrf_tag)
@@ -18,7 +18,7 @@ header.row
         input.btn.btn-small.pull-left name="enable" type="submit" value="#{t('Enable')}"
       form.pull-right action="#{cron_job_path}/delete" method="post"
         = csrf_tag if respond_to?(:csrf_tag)
-        input.btn.btn-danger.btn-small data-confirm="#{t('AreYouSureDeleteCronJob' job =@job.name)}" name="delete" type="submit" value="#{t('Delete')}" /
+        input.btn.btn-danger.btn-small data-confirm="#{t('AreYouSureDeleteCronJob', :job => @job.name)}" name="delete" type="submit" value="#{t('Delete')}" /
 
 table.table.table-bordered.table-striped
   tbody

data/lib/sidekiq/cron.rb

@@ -4,5 +4,6 @@ require "sidekiq/cron/launcher"
 
 module Sidekiq
   module Cron
+    Redis.respond_to?(:exists_returns_integer) && Redis.exists_returns_integer =  false
   end
 end

data/sidekiq-cron.gemspec

@@ -1,129 +1,48 @@
-# 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.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.required_ruby_version = ">= 2.5"
+  s.require_paths = ["lib"]
+  s.authors = ["Ondrej Bartas"]
   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.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 = [
+  s.files = Dir.glob('lib/**/*') + Dir.glob('test/**/*') + [
     ".document",
-    ".travis.yml",
     "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",
+    "Gemfile",
+    "LICENSE.txt",
+    "Rakefile",
+    "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
+ 
+  s.homepage = "https://github.com/ondrejbartas/sidekiq-cron"
+  s.licenses = ["MIT"]
+  s.summary = "Sidekiq Cron helps to add repeated scheduled jobs"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  s.add_dependency("fugit", ">= 1.1")
+  s.add_dependency("sidekiq", ">= 4.2.1")
 
-    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
+  s.add_development_dependency("minitest", ">= 0")
+  s.add_development_dependency("mocha", ">= 0")
+  s.add_development_dependency("redis-namespace", ">= 1.5.2")
+  s.add_development_dependency("rack", "~> 2.0")
+  s.add_development_dependency("rack-test", "~> 1.0")
+  s.add_development_dependency("rake", "~> 13.0")
+  s.add_development_dependency("shoulda-context", ">= 0")
+  s.add_development_dependency("simplecov", ">= 0")
 end
-

data/test/integration/performance_test.rb

@@ -5,8 +5,8 @@ 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 +31,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 +45,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,12 +1,4 @@
-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
 
 require 'simplecov'
 SimpleCov.start do
@@ -14,8 +6,6 @@ SimpleCov.start do
 
   add_group 'SidekiqCron', 'lib/'
 end
-require 'coveralls'
-Coveralls.wear!
 
 require "minitest/autorun"
 require 'shoulda-context'
@@ -26,12 +16,15 @@ 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/processor"
+require "sidekiq/fetch"
+require "sidekiq/cli"
+
 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')
 
@@ -46,6 +39,13 @@ 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
   sidekiq_options retry: true

data/test/unit/job_test.rb

@@ -363,6 +363,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')

data/test/unit/poller_test.rb

@@ -4,8 +4,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|

data/test/unit/web_extension_test.rb

@@ -1,37 +1,40 @@
 require './test/test_helper'
-
-def app
-  Sidekiq::Web
-end
+require 'sidekiq/web'
 
 describe 'Cron web' do
   include Rack::Test::Methods
 
+  TOKEN = SecureRandom.base64(32).freeze
+
+  def app
+    Sidekiq::Web
+  end
+
   before do
+    env 'rack.session', { csrf: TOKEN }
+    env 'HTTP_X_CSRF_TOKEN', TOKEN
+    REDIS.with { |c| c.respond_to?(:redis) ? c.redis.flushdb : c.flushdb }
     Sidekiq.redis = REDIS
-    Redis.current.flushdb
+  end
 
-    #clear all previous saved data from redis
-    Sidekiq.redis do |conn|
-      conn.keys("cron_job*").each do |key|
-        conn.del(key)
-      end
-    end
+  let(:job_name) { "TestNameOfCronJob" }
+  let(:cron_job_name) { "TesQueueNameOfCronJob" }
 
-    @args = {
-      name: "TestNameOfCronJob",
+  let(:args) do
+    {
+      name: job_name,
       cron: "*/2 * * * *",
       klass: "CronTestClass"
     }
+  end
 
-
-    @cron_args = {
-      name: "TesQueueNameOfCronJob",
+  let(:cron_args) do
+    {
+      name: cron_job_name,
       cron: "*/2 * * * *",
       klass: "CronQueueTestClass",
       queue: "cron"
     }
-
   end
 
   it 'display cron web' do
@@ -45,7 +48,7 @@ describe 'Cron web' do
   end
 
   it 'display cron web with cron jobs table' do
-    Sidekiq::Cron::Job.create(@args)
+    Sidekiq::Cron::Job.create(args)
 
     get '/cron'
     assert_equal 200, last_response.status
@@ -55,27 +58,25 @@ describe 'Cron web' do
   end
 
   describe "work with cron job" do
-
     before do
-      @job = Sidekiq::Cron::Job.new(@args.merge(status: "enabled"))
-      @job.save
-      @name = "TestNameOfCronJob"
+      @job = Sidekiq::Cron::Job.new(args.merge(status: "enabled"))
+      assert @job.save
 
-      @cron_job = Sidekiq::Cron::Job.new(@cron_args.merge(status: "enabled"))
-      @cron_job.save
-      @cron_job_name = "TesQueueNameOfCronJob"
+      @cron_job = Sidekiq::Cron::Job.new(cron_args.merge(status: "enabled"))
+      assert @cron_job.save
     end
 
     it 'shows history of a cron job' do
       @job.enque!
-      get "/cron/#{@name}"
+      get "/cron/#{job_name}"
 
       jid =
         Sidekiq.redis do |conn|
-          history = conn.lrange Sidekiq::Cron::Job.jid_history_key(@name), 0, -1
+          history = conn.lrange Sidekiq::Cron::Job.jid_history_key(job_name), 0, -1
           Sidekiq.load_json(history.last)['jid']
         end
 
+      assert jid
       assert last_response.body.include?(jid)
     end
 
@@ -87,18 +88,18 @@ describe 'Cron web' do
 
     it "disable and enable all cron jobs" do
       post "/cron/__all__/disable"
-      assert_equal Sidekiq::Cron::Job.find(@name).status, "disabled"
+      assert_equal Sidekiq::Cron::Job.find(job_name).status, "disabled"
 
       post "/cron/__all__/enable"
-      assert_equal Sidekiq::Cron::Job.find(@name).status, "enabled"
+      assert_equal Sidekiq::Cron::Job.find(job_name).status, "enabled"
     end
 
     it "disable and enable cron job" do
-      post "/cron/#{@name}/disable"
-      assert_equal Sidekiq::Cron::Job.find(@name).status, "disabled"
+      post "/cron/#{job_name}/disable"
+      assert_equal Sidekiq::Cron::Job.find(job_name).status, "disabled"
 
-      post "/cron/#{@name}/enable"
-      assert_equal Sidekiq::Cron::Job.find(@name).status, "enabled"
+      post "/cron/#{job_name}/enable"
+      assert_equal Sidekiq::Cron::Job.find(job_name).status, "enabled"
     end
 
     it "enqueue all jobs" do
@@ -119,21 +120,21 @@ describe 'Cron web' do
         assert_equal 0, conn.llen("queue:default"), "Queue should have no jobs"
       end
 
-      post "/cron/#{@name}/enque"
+      post "/cron/#{job_name}/enque"
 
       Sidekiq.redis do |conn|
         assert_equal 1, conn.llen("queue:default"), "Queue should have 1 job"
       end
 
       #should enqueue more times
-      post "/cron/#{@name}/enque"
+      post "/cron/#{job_name}/enque"
 
       Sidekiq.redis do |conn|
         assert_equal 2, conn.llen("queue:default"), "Queue should have 2 job"
       end
 
       #should enqueue to cron job queue
-      post "/cron/#{@cron_job_name}/enque"
+      post "/cron/#{cron_job_name}/enque"
 
       Sidekiq.redis do |conn|
         assert_equal 1, conn.llen("queue:cron"), "Queue should have 1 cron job"
@@ -142,8 +143,8 @@ describe 'Cron web' do
 
     it "destroy job" do
       assert_equal Sidekiq::Cron::Job.all.size, 2, "Should have 2 job"
-      post "/cron/#{@name}/delete"
-      post "/cron/#{@cron_job_name}/delete"
+      post "/cron/#{job_name}/delete"
+      post "/cron/#{cron_job_name}/delete"
       assert_equal Sidekiq::Cron::Job.all.size, 0, "Should have zero jobs"
     end