Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/que/testing.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require "que"
require "que/testing/que_ext"
require "que/testing/adapter"
require "que/testing/connection_pool"
require "que/testing/version"

Que.adapter = Que::Testing::Adapter.new
Que.pool = Que::Testing::ConnectionPool.new
32 changes: 0 additions & 32 deletions lib/que/testing/adapter.rb

This file was deleted.

49 changes: 49 additions & 0 deletions lib/que/testing/connection_pool.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
require_relative "job_params"

module Que
module Testing
class ConnectionPool < Que::ConnectionPool
def checkout
yield
end

def in_transaction?
true
end

def execute(command, params = [])
if command == :insert_job
insert_job(params)

params
elsif command == :bulk_insert_jobs
queue, priority, run_at, job_class, args_and_kwargs, data = params

JSON.parse(args_and_kwargs).each do |hash|
args, kwargs = hash.values_at("args", "kwargs").map { |x| JSON.dump(x) }

insert_job([queue, priority, run_at, job_class, args, kwargs, data])
end

params
else
[]
end
end

private def insert_job(params)
job = JobParams.new(*params)
klass = class_for(job.job_class)
jobs[klass] << job
end

private def class_for(str)
str.split('::').reduce(Object, &:const_get)
end

def jobs
@jobs ||= Hash.new { |h,k| h[k] = [] }
end
end
end
end
30 changes: 30 additions & 0 deletions lib/que/testing/job_params.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
module Que
module Testing
if Que::VERSION >= Gem::Version.new("2")
# kwargs added in Que 2.0.0
class JobParams < Struct.new(:queue, :priority, :run_at, :job_class, :args, :kwargs, :data)
def args
Que.deserialize_json(super)
end

def kwargs
Que.deserialize_json(super)
end

def data
Que.deserialize_json(super)
end
end
else
class JobParams < Struct.new(:queue, :priority, :run_at, :job_class, :args, :data)
def args
Que.deserialize_json(super)
Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Args are now serialised before the call to exec insert_job: https://github.com/que-rb/que/blob/v1.4.1/lib/que/job.rb#L83-L84

end

def data
Que.deserialize_json(super)
end
end
end
end
end
2 changes: 1 addition & 1 deletion lib/que/testing/que_ext.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module Que
class Job
def self.jobs
Que.adapter.jobs[self]
Que.pool.jobs[self]
end
end
end
2 changes: 1 addition & 1 deletion lib/que/testing/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Que
module Testing
VERSION = "0.2.0"
VERSION = "1.0.0"
end
end
2 changes: 1 addition & 1 deletion que-testing.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
spec.require_paths = ["lib"]

spec.add_runtime_dependency "que"
spec.add_runtime_dependency "que", ">= 1"

spec.add_development_dependency "bundler", "~> 1.6"
spec.add_development_dependency "rake", "~> 10.0"
Expand Down