Changed the AJADAPTER to AJ_ADAPTER
* This allows for easier reading, since those are two words, so they should be split by _ Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
This commit is contained in:
parent
de9a3748c4
commit
e380ac685b
|
@ -28,7 +28,7 @@ namespace :test do
|
||||||
end
|
end
|
||||||
|
|
||||||
ACTIVEJOB_ADAPTERS.each do |adapter|
|
ACTIVEJOB_ADAPTERS.each do |adapter|
|
||||||
task("env:#{adapter}") { ENV['AJADAPTER'] = adapter }
|
task("env:#{adapter}") { ENV['AJ_ADAPTER'] = adapter }
|
||||||
|
|
||||||
Rake::TestTask.new(adapter => "test:env:#{adapter}") do |t|
|
Rake::TestTask.new(adapter => "test:env:#{adapter}") do |t|
|
||||||
t.description = "Run adapter tests for #{adapter}"
|
t.description = "Run adapter tests for #{adapter}"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
require 'helper'
|
require 'helper'
|
||||||
|
|
||||||
class AdapterTest < ActiveSupport::TestCase
|
class AdapterTest < ActiveSupport::TestCase
|
||||||
test "should load #{ENV['AJADAPTER']} adapter" do
|
test "should load #{ENV['AJ_ADAPTER']} adapter" do
|
||||||
assert_equal "active_job/queue_adapters/#{ENV['AJADAPTER']}_adapter".classify, ActiveJob::Base.queue_adapter.name
|
assert_equal "active_job/queue_adapters/#{ENV['AJ_ADAPTER']}_adapter".classify, ActiveJob::Base.queue_adapter.name
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -5,7 +5,7 @@ require 'support/job_buffer'
|
||||||
|
|
||||||
GlobalID.app = 'aj'
|
GlobalID.app = 'aj'
|
||||||
|
|
||||||
@adapter = ENV['AJADAPTER'] || 'inline'
|
@adapter = ENV['AJ_ADAPTER'] || 'inline'
|
||||||
|
|
||||||
if ENV['AJ_INTEGRATION_TESTS']
|
if ENV['AJ_INTEGRATION_TESTS']
|
||||||
require 'support/integration/helper'
|
require 'support/integration/helper'
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
if ENV['AJADAPTER'] == 'delayed_job'
|
if ENV['AJ_ADAPTER'] == 'delayed_job'
|
||||||
generate "delayed_job:active_record", "--quiet"
|
generate "delayed_job:active_record", "--quiet"
|
||||||
rake("db:migrate")
|
rake("db:migrate")
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
puts "*** rake aj:integration:#{ENV['AJADAPTER']} ***\n"
|
puts "*** rake aj:integration:#{ENV['AJ_ADAPTER']} ***\n"
|
||||||
|
|
||||||
ENV["RAILS_ENV"] = "test"
|
ENV["RAILS_ENV"] = "test"
|
||||||
ActiveJob::Base.queue_name_prefix = nil
|
ActiveJob::Base.queue_name_prefix = nil
|
||||||
|
|
|
@ -3,7 +3,7 @@ class JobsManager
|
||||||
attr :adapter_name
|
attr :adapter_name
|
||||||
|
|
||||||
def self.current_manager
|
def self.current_manager
|
||||||
@@managers[ENV['AJADAPTER']] ||= new(ENV['AJADAPTER'])
|
@@managers[ENV['AJ_ADAPTER']] ||= new(ENV['AJ_ADAPTER'])
|
||||||
end
|
end
|
||||||
|
|
||||||
def initialize(adapter_name)
|
def initialize(adapter_name)
|
||||||
|
|
Loading…
Reference in New Issue