mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-23 15:48:43 -05:00
Use 4.0 api for job fakes (as opposed to master)
This commit is contained in:
parent
426299d261
commit
a22abda594
1 changed files with 8 additions and 11 deletions
|
@ -6,25 +6,23 @@ require 'sidekiq/testing'
|
||||||
describe Topic do
|
describe Topic do
|
||||||
|
|
||||||
def scheduled_jobs_for(job_name, params={})
|
def scheduled_jobs_for(job_name, params={})
|
||||||
Sidekiq::Queues["default"].select do |job|
|
"Jobs::#{job_name.to_s.camelcase}".constantize.jobs.select do |job|
|
||||||
job_args = job['args'][0]
|
job_args = job['args'][0]
|
||||||
if job['class'] == "Jobs::#{job_name.to_s.camelcase}"
|
matched = true
|
||||||
matched = true
|
params.each do |key, value|
|
||||||
params.each do |key, value|
|
unless job_args[key.to_s] == value
|
||||||
unless job_args[key.to_s] == value
|
matched = false
|
||||||
matched = false
|
break
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
matched
|
|
||||||
end
|
end
|
||||||
|
matched
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
before {
|
before {
|
||||||
Sidekiq::Queues.clear_all
|
|
||||||
SiteSetting.queue_jobs = true
|
SiteSetting.queue_jobs = true
|
||||||
|
Jobs::CloseTopic.jobs.clear
|
||||||
}
|
}
|
||||||
|
|
||||||
context 'creating a topic without auto-close' do
|
context 'creating a topic without auto-close' do
|
||||||
|
@ -44,7 +42,6 @@ describe Topic do
|
||||||
|
|
||||||
context 'jobs may be queued' do
|
context 'jobs may be queued' do
|
||||||
before do
|
before do
|
||||||
Sidekiq::Queues.clear_all
|
|
||||||
Timecop.freeze(Time.zone.now)
|
Timecop.freeze(Time.zone.now)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue