change to args which will be passed to Job#perform

This commit is contained in:
Jannis Hübl
2016-01-14 09:33:14 +01:00
parent dd4f92b569
commit 89f3b9a8a1
6 changed files with 30 additions and 30 deletions

View File

@@ -2,10 +2,10 @@ require 'spec_helper'
describe Crono::Job do
let(:period) { Crono::Period.new(2.day, at: '15:00') }
let(:data) {{some: 'data'}}
let(:job) { Crono::Job.new(TestJob, period, nil) }
let(:job_with_data) { Crono::Job.new(TestJob, period, data) }
let(:failing_job) { Crono::Job.new(TestFailingJob, period, nil) }
let(:job_args) {[{some: 'data'}]}
let(:job) { Crono::Job.new(TestJob, period, []) }
let(:job_with_args) { Crono::Job.new(TestJob, period, job_args) }
let(:failing_job) { Crono::Job.new(TestFailingJob, period, []) }
it 'should contain performer and period' do
expect(job.performer).to be TestJob
@@ -13,7 +13,7 @@ describe Crono::Job do
end
it 'should contain data as JSON String' do
expect(job_with_data.data).to eq '{"some":"data"}'
expect(job_with_args.job_args).to eq '[{"some":"data"}]'
end
describe '#next' do
@@ -69,8 +69,10 @@ describe Crono::Job do
end
it 'should call perform of performer with data' do
expect(TestJob).to receive(:new).with({"some" => "data"})
thread = job_with_data.perform.join
test_job = double()
expect(TestJob).to receive(:new).and_return(test_job)
expect(test_job).to receive(:perform).with({'some' => 'data'})
thread = job_with_args.perform.join
expect(thread).to be_stop
end
@@ -98,12 +100,12 @@ describe Crono::Job do
it 'should update saved job' do
job.last_performed_at = Time.now
job.healthy = true
job.data = JSON.generate({some: 'data'})
job.job_args = JSON.generate([{some: 'data'}])
job.save
@crono_job = Crono::CronoJob.find_by(job_id: job.job_id)
expect(@crono_job.last_performed_at.utc.to_s).to be_eql job.last_performed_at.utc.to_s
expect(@crono_job.healthy).to be true
expect(@crono_job.data).to eq '{"some":"data"}'
expect(@crono_job.args).to eq '[{"some":"data"}]'
end
it 'should save and truncate job log' do
@@ -122,7 +124,7 @@ describe Crono::Job do
end
it 'should load last_performed_at from DB' do
@job = Crono::Job.new(TestJob, period, data)
@job = Crono::Job.new(TestJob, period, job_args)
@job.load
expect(@job.last_performed_at.utc.to_s).to be_eql @saved_last_performed_at.utc.to_s
end

View File

@@ -19,9 +19,9 @@ describe Crono::PerformerProxy do
Crono.perform(TestJob).once_per 10.minutes
end
it 'should add job with data to schedule' do
expect(Crono::Job).to receive(:new).with(TestJob, kind_of(Crono::Period), {some: 'data'})
it 'should add job with args to schedule' do
expect(Crono::Job).to receive(:new).with(TestJob, kind_of(Crono::Period), [:some, {some: 'data'}])
allow(Crono.scheduler).to receive(:add_job)
Crono.perform(TestJob, {some: 'data'}).every(2.days, at: '15:30')
Crono.perform(TestJob, :some, {some: 'data'}).every(2.days, at: '15:30')
end
end

View File

@@ -5,7 +5,7 @@ describe Crono::Scheduler do
describe '#add_job' do
it 'should call Job#load on Job' do
@job = Crono::Job.new(TestJob, Crono::Period.new(10.day, at: '04:05'), nil)
@job = Crono::Job.new(TestJob, Crono::Period.new(10.day, at: '04:05'), [])
expect(@job).to receive(:load)
scheduler.add_job(@job)
end
@@ -17,7 +17,7 @@ describe Crono::Scheduler do
Crono::Period.new(3.days, at: 10.minutes.from_now.strftime('%H:%M')),
Crono::Period.new(1.day, at: 20.minutes.from_now.strftime('%H:%M')),
Crono::Period.new(7.days, at: 40.minutes.from_now.strftime('%H:%M'))
].map { |period| Crono::Job.new(TestJob, period, nil) }
].map { |period| Crono::Job.new(TestJob, period, []) }
time, jobs = scheduler.next_jobs
expect(jobs).to be_eql [jobs[0]]
@@ -29,7 +29,7 @@ describe Crono::Scheduler do
Crono::Period.new(1.day, at: time.strftime('%H:%M')),
Crono::Period.new(1.day, at: time.strftime('%H:%M')),
Crono::Period.new(1.day, at: 10.minutes.from_now.strftime('%H:%M'))
].map { |period| Crono::Job.new(TestJob, period, nil) }
].map { |period| Crono::Job.new(TestJob, period, []) }
time, jobs = scheduler.next_jobs
expect(jobs).to be_eql [jobs[0], jobs[1]]
@@ -40,7 +40,7 @@ describe Crono::Scheduler do
Crono::Period.new(10.seconds),
Crono::Period.new(10.seconds),
Crono::Period.new(1.day, at: 10.minutes.from_now.strftime('%H:%M'))
].map { |period| Crono::Job.new(TestJob, period, nil) }
].map { |period| Crono::Job.new(TestJob, period, []) }
_, next_jobs = scheduler.next_jobs
expect(next_jobs).to be_eql [jobs[0]]