aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-30 21:05:29 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-30 21:05:29 -0300
commit0d1ab3491522a6b757e864412c84406764f10b9d (patch)
tree636632992460e0c29c882f11b8fb39d87a9c93f6 /activejob/test
parent04852b875ec5c2bd5e5f8bf525b7be60682d0c27 (diff)
parent8a73f4b5b9d342a45b3c8e29a13142adbca9ab21 (diff)
downloadrails-0d1ab3491522a6b757e864412c84406764f10b9d.tar.gz
rails-0d1ab3491522a6b757e864412c84406764f10b9d.tar.bz2
rails-0d1ab3491522a6b757e864412c84406764f10b9d.zip
Merge pull request #18266 from cristianbica/ajfixes
ActiveJob testing improvements
Diffstat (limited to 'activejob/test')
-rw-r--r--activejob/test/adapters/test.rb3
-rw-r--r--activejob/test/cases/adapter_test.rb3
2 files changed, 4 insertions, 2 deletions
diff --git a/activejob/test/adapters/test.rb b/activejob/test/adapters/test.rb
new file mode 100644
index 0000000000..7180b38a57
--- /dev/null
+++ b/activejob/test/adapters/test.rb
@@ -0,0 +1,3 @@
+ActiveJob::Base.queue_adapter = :test
+ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
+ActiveJob::Base.queue_adapter.perform_enqueued_at_jobs = true
diff --git a/activejob/test/cases/adapter_test.rb b/activejob/test/cases/adapter_test.rb
index 61a7cae5bf..6570c55a83 100644
--- a/activejob/test/cases/adapter_test.rb
+++ b/activejob/test/cases/adapter_test.rb
@@ -2,7 +2,6 @@ require 'helper'
class AdapterTest < ActiveSupport::TestCase
test "should load #{ENV['AJADAPTER']} adapter" do
- ActiveJob::Base.queue_adapter = ENV['AJADAPTER'].to_sym
- assert_equal "active_job/queue_adapters/#{ENV['AJADAPTER']}_adapter".classify.constantize, ActiveJob::Base.queue_adapter
+ assert_equal "active_job/queue_adapters/#{ENV['AJADAPTER']}_adapter".classify, ActiveJob::Base.queue_adapter.name
end
end