aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAbdelkader Boudih <terminale@gmail.com>2014-05-18 20:59:12 +0000
committerAbdelkader Boudih <terminale@gmail.com>2014-05-18 20:59:12 +0000
commit91461dc7a9f0aa879cfff503ea2fdb9a71e0277e (patch)
tree75ba9ac32f1bc59b490f096d61dc8012f3daae8a /test
parent68543de83612049e3254f7243b575039f102cd49 (diff)
downloadrails-91461dc7a9f0aa879cfff503ea2fdb9a71e0277e.tar.gz
rails-91461dc7a9f0aa879cfff503ea2fdb9a71e0277e.tar.bz2
rails-91461dc7a9f0aa879cfff503ea2fdb9a71e0277e.zip
Lazy-load adapters, fixes #6
Diffstat (limited to 'test')
-rw-r--r--test/adapters/inline.rb1
-rw-r--r--test/adapters/resque.rb2
-rw-r--r--test/adapters/sidekiq.rb2
-rw-r--r--test/adapters/sucker_punch.rb2
-rw-r--r--test/cases/adapter_test.rb31
5 files changed, 35 insertions, 3 deletions
diff --git a/test/adapters/inline.rb b/test/adapters/inline.rb
index e69de29bb2..131dd029b3 100644
--- a/test/adapters/inline.rb
+++ b/test/adapters/inline.rb
@@ -0,0 +1 @@
+ActiveJob::Base.adapter = :inline \ No newline at end of file
diff --git a/test/adapters/resque.rb b/test/adapters/resque.rb
index 7431d2d742..6e11f864c2 100644
--- a/test/adapters/resque.rb
+++ b/test/adapters/resque.rb
@@ -1,2 +1,2 @@
-ActiveJob::Base.queue_adapter = ActiveJob::QueueAdapters::ResqueAdapter
+ActiveJob::Base.adapter = :resque
Resque.inline = true
diff --git a/test/adapters/sidekiq.rb b/test/adapters/sidekiq.rb
index 74ce808d55..55153d0bc6 100644
--- a/test/adapters/sidekiq.rb
+++ b/test/adapters/sidekiq.rb
@@ -1,2 +1,2 @@
require 'sidekiq/testing/inline'
-ActiveJob::Base.queue_adapter = ActiveJob::QueueAdapters::SidekiqAdapter
+ActiveJob::Base.adapter = :sidekiq
diff --git a/test/adapters/sucker_punch.rb b/test/adapters/sucker_punch.rb
index a373552262..8ce9a902b6 100644
--- a/test/adapters/sucker_punch.rb
+++ b/test/adapters/sucker_punch.rb
@@ -1,2 +1,2 @@
require 'sucker_punch/testing/inline'
-ActiveJob::Base.queue_adapter = ActiveJob::QueueAdapters::SuckerPunchAdapter
+ActiveJob::Base.adapter = :sucker_punch
diff --git a/test/cases/adapter_test.rb b/test/cases/adapter_test.rb
new file mode 100644
index 0000000000..eac92fb27d
--- /dev/null
+++ b/test/cases/adapter_test.rb
@@ -0,0 +1,31 @@
+require 'helper'
+
+class AdapterTest < ActiveSupport::TestCase
+ def setup
+ @old_adapter = ActiveJob::Base.queue_adapter
+ end
+
+ test 'should load inline adapter' do
+ ActiveJob::Base.adapter = :inline
+ assert_equal ActiveJob::QueueAdapters::InlineAdapter, ActiveJob::Base.queue_adapter
+ end
+
+ test 'should load resque adapter' do
+ ActiveJob::Base.adapter = :resque
+ assert_equal ActiveJob::QueueAdapters::ResqueAdapter, ActiveJob::Base.queue_adapter
+ end
+
+ test 'should load sidekiq adapter' do
+ ActiveJob::Base.adapter = :sidekiq
+ assert_equal ActiveJob::QueueAdapters::SidekiqAdapter, ActiveJob::Base.queue_adapter
+ end
+
+ test 'should load sucker punch adapter' do
+ ActiveJob::Base.adapter = :sucker_punch
+ assert_equal ActiveJob::QueueAdapters::SuckerPunchAdapter, ActiveJob::Base.queue_adapter
+ end
+
+ def teardown
+ ActiveJob::Base.queue_adapter = @old_adapter
+ end
+end