diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-02-22 16:11:21 +0100 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-02-22 16:11:21 +0100 |
| commit | e380ac685b31f094f21b96619d1693e9dbe4f6e3 (patch) | |
| tree | d83ade1dab014606acc5c8e647045bdbc1de2aac /activejob/test/support/integration | |
| parent | de9a3748c436f849dd1877851115cd94663c2725 (diff) | |
| download | rails-e380ac685b31f094f21b96619d1693e9dbe4f6e3.tar.gz rails-e380ac685b31f094f21b96619d1693e9dbe4f6e3.tar.bz2 rails-e380ac685b31f094f21b96619d1693e9dbe4f6e3.zip | |
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>
Diffstat (limited to 'activejob/test/support/integration')
| -rw-r--r-- | activejob/test/support/integration/dummy_app_template.rb | 2 | ||||
| -rw-r--r-- | activejob/test/support/integration/helper.rb | 2 | ||||
| -rw-r--r-- | activejob/test/support/integration/jobs_manager.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/activejob/test/support/integration/dummy_app_template.rb b/activejob/test/support/integration/dummy_app_template.rb index 65994d6a1c..09a68738ad 100644 --- a/activejob/test/support/integration/dummy_app_template.rb +++ b/activejob/test/support/integration/dummy_app_template.rb @@ -1,4 +1,4 @@ -if ENV['AJADAPTER'] == 'delayed_job' +if ENV['AJ_ADAPTER'] == 'delayed_job' generate "delayed_job:active_record", "--quiet" rake("db:migrate") end diff --git a/activejob/test/support/integration/helper.rb b/activejob/test/support/integration/helper.rb index 39e41b6d29..8c2e5a86c2 100644 --- a/activejob/test/support/integration/helper.rb +++ b/activejob/test/support/integration/helper.rb @@ -1,4 +1,4 @@ -puts "*** rake aj:integration:#{ENV['AJADAPTER']} ***\n" +puts "*** rake aj:integration:#{ENV['AJ_ADAPTER']} ***\n" ENV["RAILS_ENV"] = "test" ActiveJob::Base.queue_name_prefix = nil diff --git a/activejob/test/support/integration/jobs_manager.rb b/activejob/test/support/integration/jobs_manager.rb index 4df34aaeb1..78d48e8d9a 100644 --- a/activejob/test/support/integration/jobs_manager.rb +++ b/activejob/test/support/integration/jobs_manager.rb @@ -3,7 +3,7 @@ class JobsManager attr :adapter_name def self.current_manager - @@managers[ENV['AJADAPTER']] ||= new(ENV['AJADAPTER']) + @@managers[ENV['AJ_ADAPTER']] ||= new(ENV['AJ_ADAPTER']) end def initialize(adapter_name) |