sidekiq-cron 1.2.0 → 1.7.0

data/test/unit/job_test.rb

@@ -1,16 +1,15 @@
-# -*- encoding : utf-8 -*-
 require './test/test_helper'
 
 describe "Cron Job" do
   before do
-    #clear all previous saved data from redis
+    # Clear all previous saved data from Redis.
     Sidekiq.redis do |conn|
       conn.keys("cron_job*").each do |key|
         conn.del(key)
       end
     end
 
-    #clear all queues
+    # Clear all queues.
     Sidekiq::Queue.all.each do |queue|
       queue.clear
     end
@@ -76,7 +75,6 @@ describe "Cron Job" do
   end
 
   describe "invalid job" do
-
     before do
       @job = Sidekiq::Cron::Job.new()
     end
@@ -131,6 +129,22 @@ describe "Cron Job" do
     end
   end
 
+  describe 'cron formats' do
+    before do
+      @args = {
+        name: "Test",
+        klass: "CronTestClass"
+      }
+    end
+
+    it 'should support natural language format' do
+      @args[:cron] = "every 3 hours"
+      @job = Sidekiq::Cron::Job.new(@args)
+      assert @job.valid?
+      assert_equal Fugit::Cron.new("0 */3 * * *"), @job.send(:parsed_cron)
+    end
+  end
+
   describe 'parse_enqueue_time' do
     before do
       @args = {
@@ -233,8 +247,11 @@ describe "Cron Job" do
                                  "queue"=>:super,
                                  "backtrace"=>true,
                                  "class"=>"CronTestClassWithQueue"}
-      assert job_args[-1].is_a?(Float)
-      assert job_args[-1].between?(Time.now.to_f - 1, Time.now.to_f)
+      assert job_args.empty?
+
+      enqueue_args = job.enqueue_args
+      assert enqueue_args[-1].is_a?(Float)
+      assert enqueue_args[-1].between?(Time.now.to_f - 1, Time.now.to_f)
     end
 
     it "be initialized with 'class', 2 arguments and date_as_argument" do
@@ -246,11 +263,13 @@ describe "Cron Job" do
                                  "queue"=>:super,
                                  "backtrace"=>true,
                                  "class"=>"CronTestClassWithQueue"}
-      assert job_args[-1].is_a?(Float)
-      assert job_args[-1].between?(Time.now.to_f - 1, Time.now.to_f)
-      assert_equal job_args[0..-2], ["arg1", :arg2]
-    end
+      assert_equal job_args, ["arg1", :arg2]
 
+      enqueue_args = job.enqueue_args
+      assert_equal enqueue_args[0..-2], ["arg1", :arg2]
+      assert enqueue_args[-1].is_a?(Float)
+      assert enqueue_args[-1].between?(Time.now.to_f - 1, Time.now.to_f)
+    end
   end
 
   describe "cron test" do
@@ -304,6 +323,21 @@ describe "Cron Job" do
       }
       assert_equal @job.sidekiq_worker_message, payload
     end
+
+    describe 'with date_as_argument' do
+      before do
+        @args.merge!(date_as_argument: true)
+        @job = Sidekiq::Cron::Job.new(@args)
+      end
+
+      let(:args) { @job.sidekiq_worker_message['args'] }
+
+      it 'should add timestamp to args' do
+        assert_equal args[0], {foo: 'bar'}
+        assert args[-1].is_a?(Float)
+        assert args[-1].between?(Time.now.to_f - 1, Time.now.to_f)
+      end
+    end
   end
 
   describe '#sidekiq_worker_message settings overwrite queue name' do
@@ -361,6 +395,124 @@ describe "Cron Job" do
       }
       assert_equal @job.active_job_message, payload
     end
+
+    describe 'with date_as_argument' do
+      before do
+        @args.merge!(date_as_argument: true)
+        @job = Sidekiq::Cron::Job.new(@args)
+      end
+
+      let(:args) { @job.active_job_message['args'][0]['arguments'] }
+
+      it 'should add timestamp to args' do
+        args = @job.active_job_message['args'][0]['arguments']
+        assert_equal args[0], {foo: 'bar'}
+        assert args[-1].is_a?(Float)
+        assert args[-1].between?(Time.now.to_f - 1, Time.now.to_f)
+      end
+    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
@@ -412,6 +564,23 @@ describe "Cron Job" do
             .returns(ActiveJobCronTestClass.new)
         @job.enque!
       end
+
+      describe 'with date_as_argument' do
+        before do
+          @args.merge!(date_as_argument: true)
+          @job = Sidekiq::Cron::Job.new(@args)
+        end
+
+        it 'should add timestamp to args' do
+          ActiveJobCronTestClass.expects(:perform_later)
+                                .returns(ActiveJobCronTestClass.new)
+                                .with { |*args|
+                                  assert args[-1].is_a?(Float)
+                                  assert args[-1].between?(Time.now.to_f - 1, Time.now.to_f)
+                                }
+          @job.enque!
+        end
+      end
     end
 
     describe 'active job with queue_name_prefix' do
@@ -539,6 +708,24 @@ describe "Cron Job" do
             .returns(true)
         @job.enque!
       end
+
+      describe 'with date_as_argument' do
+        before do
+          @args.merge!(date_as_argument: true)
+          @job = Sidekiq::Cron::Job.new(@args)
+        end
+
+        it 'should add timestamp to args' do
+          CronTestClass::Setter.any_instance
+                               .expects(:perform_async)
+                               .returns(true)
+                               .with { |*args|
+                                 assert args[-1].is_a?(Float)
+                                 assert args[-1].between?(Time.now.to_f - 1, Time.now.to_f)
+                               }
+          @job.enque!
+        end
+      end
     end
 
     describe 'sidekiq worker unknown class' do
@@ -649,7 +836,7 @@ describe "Cron Job" do
     end
 
     it "last_enqueue_time shouldn't be rewritten after save" do
-      #adding last_enqueue_time to initialize is only for test purpose
+      # Adding last_enqueue_time to initialize is only for testing purposes.
       last_enqueue_time = '2013-01-01 23:59:59 +0000'
       expected_enqueue_time = DateTime.parse(last_enqueue_time).to_time.utc
       Sidekiq::Cron::Job.create(@args.merge('last_enqueue_time' => last_enqueue_time))
@@ -675,6 +862,7 @@ describe "Cron Job" do
         assert_equal job.name, "Test"
       end
     end
+
     it "from String" do
       args = {
         name: "Test",
@@ -687,6 +875,7 @@ describe "Cron Job" do
         assert_equal job.name, "Test"
       end
     end
+
     it "from Array" do
       args = {
         name: "Test",
@@ -758,7 +947,6 @@ describe "Cron Job" do
       Sidekiq::Cron::Job.create(@args)
       assert Sidekiq::Cron::Job.find('name' => "Test"), "String keys"
     end
-
   end
 
   describe "destroy" do
@@ -795,7 +983,6 @@ describe "Cron Job" do
       Sidekiq::Cron::Job.create(@args)
       assert Sidekiq::Cron::Job.destroy('name' => "Test"), "String keys"
     end
-
   end
 
   describe "destroy_removed_jobs" do
@@ -827,11 +1014,11 @@ describe "Cron Job" do
         cron: "* * * * *",
         klass: "CronTestClass"
       }
-      #first time is allways
-      #after next cron time!
+      # 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
@@ -852,7 +1039,6 @@ describe "Cron Job" do
       assert Sidekiq::Cron::Job.new(@args).should_enque? @time + 235
       refute Sidekiq::Cron::Job.new(@args).should_enque? @time + 235
 
-      #just for check
       refute Sidekiq::Cron::Job.new(@args).should_enque? @time
       refute Sidekiq::Cron::Job.new(@args).should_enque? @time + 135
       refute Sidekiq::Cron::Job.new(@args).should_enque? @time + 235
@@ -868,7 +1054,7 @@ describe "Cron Job" do
       assert job.test_and_enque_for_time!(@time), "should enqueue"
 
       future_now = @time + 1 * 60 * 60
-      Time.stubs(:now).returns(future_now) # save uses Time.now.utc
+      Time.stubs(:now).returns(future_now) # Save uses Time.now.utc
       job.save
       assert Sidekiq::Cron::Job.new(@args).test_and_enque_for_time!(future_now + 30), "should enqueue"
     end
@@ -885,7 +1071,7 @@ describe "Cron Job" do
       end
       assert_equal Sidekiq::Queue.all.first.size, 1, "Sidekiq queue 1 job in queue"
 
-      # 20 hours after
+      # 20 hours after.
       assert Sidekiq::Cron::Job.new(@args).test_and_enque_for_time! @time + 1 * 60 * 60
       refute Sidekiq::Cron::Job.new(@args).test_and_enque_for_time! @time + 1 * 60 * 60
 
@@ -894,7 +1080,7 @@ describe "Cron Job" do
       end
       assert_equal Sidekiq::Queue.all.first.size, 2, "Sidekiq queue 2 jobs in queue"
 
-      # 26 hour after
+      # 26 hour after.
       assert Sidekiq::Cron::Job.new(@args).test_and_enque_for_time! @time + 26 * 60 * 60
       refute Sidekiq::Cron::Job.new(@args).test_and_enque_for_time! @time + 26 * 60 * 60
 
@@ -906,7 +1092,6 @@ describe "Cron Job" do
   end
 
   describe "load" do
-
     describe "from hash" do
       before do
         @jobs_hash = {
@@ -929,9 +1114,19 @@ describe "Cron Job" do
         assert_equal Sidekiq::Cron::Job.all.size, 2, "Should have 2 jobs after load"
       end
 
+      it "duplicate jobs are not loaded" do
+        out = Sidekiq::Cron::Job.load_from_hash @jobs_hash
+        assert_equal out.size, 0, "should have no errors"
+        assert_equal Sidekiq::Cron::Job.all.size, 2, "Should have 2 jobs after load"
+
+        out_2 = Sidekiq::Cron::Job.load_from_hash @jobs_hash
+        assert_equal out_2.size, 0, "should have no errors"
+        assert_equal Sidekiq::Cron::Job.all.size, 2, "Should have 2 jobs after loading again"
+      end
+
       it "return errors on loaded jobs" do
         assert_equal Sidekiq::Cron::Job.all.size, 0, "Should have 0 jobs before load"
-        #set something bag to hash
+        # Set something bad to hash.
         @jobs_hash['name_of_job']['cron'] = "bad cron"
         out = Sidekiq::Cron::Job.load_from_hash @jobs_hash
         assert_equal 1, out.size, "should have 1 error"
@@ -981,6 +1176,16 @@ describe "Cron Job" do
         assert_equal Sidekiq::Cron::Job.all.size, 2, "Should have 2 jobs after load"
       end
 
+      it "duplicate jobs are not loaded" do
+        out = Sidekiq::Cron::Job.load_from_array @jobs_array
+        assert_equal out.size, 0, "should have no errors"
+        assert_equal Sidekiq::Cron::Job.all.size, 2, "Should have 2 jobs after load"
+
+        out_2 = Sidekiq::Cron::Job.load_from_array @jobs_array
+        assert_equal out_2.size, 0, "should have no errors"
+        assert_equal Sidekiq::Cron::Job.all.size, 2, "Should have 2 jobs after loading again"
+      end
+
       it "create new jobs and update old one with same settings with load_from_array" do
         assert_equal Sidekiq::Cron::Job.all.size, 0, "Should have 0 jobs before load"
         out = Sidekiq::Cron::Job.load_from_array! @jobs_array
@@ -1018,7 +1223,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,13 +1,11 @@
-# -*- 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
+    # Clear all previous saved data from Redis.
     Sidekiq.redis do |conn|
       conn.keys("cron_job*").each do |key|
         conn.del(key)
@@ -29,7 +27,7 @@ describe 'Cron Poller' do
     now = Time.now.utc + 3600
     enqueued_time = Time.new(now.year, now.month, now.day, now.hour, 5, 1)
     Time.stubs(:now).returns(enqueued_time)
-    #new jobs!
+
     Sidekiq::Cron::Job.create(@args)
     Sidekiq::Cron::Job.create(@args2)
 
@@ -40,7 +38,7 @@ describe 'Cron Poller' do
       assert_equal 0, conn.llen("queue:super")
     end
 
-    #30 seconds after!
+    # 30 seconds after!
     enqueued_time = Time.new(now.year, now.month, now.day, now.hour, 5, 30)
     Time.stubs(:now).returns(enqueued_time)
 
@@ -56,7 +54,7 @@ describe 'Cron Poller' do
     now = Time.now.utc + 3600
     enqueued_time = Time.new(now.year, now.month, now.day, now.hour, 5, 1)
     Time.stubs(:now).returns(enqueued_time)
-    #new jobs!
+
     Sidekiq::Cron::Job.create(@args)
     Sidekiq::Cron::Job.create(@args2)
 
@@ -81,7 +79,7 @@ describe 'Cron Poller' do
     now = Time.now.utc + 3600
     enqueued_time = Time.new(now.year, now.month, now.day, now.hour, 8, 1)
     Time.stubs(:now).returns(enqueued_time)
-    #new jobs!
+
     Sidekiq::Cron::Job.create(@args)
     Sidekiq::Cron::Job.create(@args2)
 
@@ -106,7 +104,7 @@ describe 'Cron Poller' do
     now = Time.now.utc + 3600
     enqueued_time = Time.new(now.year, now.month, now.day, now.hour, 8, 1)
     Time.stubs(:now).returns(enqueued_time)
-    #new jobs!
+
     Sidekiq::Cron::Job.create(@args)
     Sidekiq::Cron::Job.create(@args2)
 

data/test/unit/schedule_loader_test.rb

@@ -0,0 +1,45 @@
+require './test/test_helper'
+
+describe 'ScheduleLoader' do
+  before do
+    Sidekiq.options[:lifecycle_events][:startup].clear
+  end
+
+  describe 'Schedule is defined in hash' do
+    before do
+      Sidekiq::Options[:cron_schedule_file] = 'test/unit/fixtures/schedule_hash.yml'
+      load 'sidekiq/cron/schedule_loader.rb'
+    end
+
+    it 'calls Sidekiq::Cron::Job.load_from_hash' do
+      Sidekiq::Cron::Job.expects(:load_from_hash)
+      Sidekiq.options[:lifecycle_events][:startup].first.call
+    end
+  end
+
+  describe 'Schedule is defined in array' do
+    before do
+      Sidekiq::Options[:cron_schedule_file] = 'test/unit/fixtures/schedule_array.yml'
+      load 'sidekiq/cron/schedule_loader.rb'
+    end
+
+    it 'calls Sidekiq::Cron::Job.load_from_array' do
+      Sidekiq::Cron::Job.expects(:load_from_array)
+      Sidekiq.options[:lifecycle_events][:startup].first.call
+    end
+  end
+
+  describe 'Schedule is not defined in hash nor array' do
+    before do
+      Sidekiq::Options[:cron_schedule_file] = 'test/unit/fixtures/schedule_string.yml'
+      load 'sidekiq/cron/schedule_loader.rb'
+    end
+
+    it 'raises an error' do
+      e = assert_raises StandardError do
+        Sidekiq.options[:lifecycle_events][:startup].first.call
+      end
+      assert_equal 'Not supported schedule format. Confirm your test/unit/fixtures/schedule_string.yml', e.message
+    end
+  end
+end

data/test/unit/web_extension_test.rb

@@ -1,37 +1,39 @@
 require './test/test_helper'
 
-def app
-  Sidekiq::Web
-end
-
 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 +47,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 +57,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 +87,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 +119,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"
+      # Should enqueue more times.
+      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"
+      # Should enqueue to cron job queue.
+      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 +142,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