aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/test/integration
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-10-10 08:53:22 +0200
committerYves Senn <yves.senn@gmail.com>2014-10-10 08:55:17 +0200
commit64e64c6f041224fefc03bbfdd2dd86d494df1990 (patch)
tree376ac7c603abb1e29c6399644d4fb187d11818e0 /activejob/test/integration
parent5f1a274b68ecd2945759e31be7ddcabe37f26611 (diff)
downloadrails-64e64c6f041224fefc03bbfdd2dd86d494df1990.tar.gz
rails-64e64c6f041224fefc03bbfdd2dd86d494df1990.tar.bz2
rails-64e64c6f041224fefc03bbfdd2dd86d494df1990.zip
tests, move `original_` var assignments outside of `begin`.
Diffstat (limited to 'activejob/test/integration')
-rw-r--r--activejob/test/integration/queuing_test.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb
index 779dedb53f..219be11509 100644
--- a/activejob/test/integration/queuing_test.rb
+++ b/activejob/test/integration/queuing_test.rb
@@ -10,9 +10,10 @@ class QueuingTest < ActiveSupport::TestCase
end
test 'should not run jobs queued on a non-listenting queue' do
+ skip if adapter_is?(:inline) || adapter_is?(:sucker_punch)
+ old_queue = TestJob.queue_name
+
begin
- skip if adapter_is?(:inline) || adapter_is?(:sucker_punch)
- old_queue = TestJob.queue_name
TestJob.queue_as :some_other_queue
TestJob.perform_later @id
wait_for_jobs_to_finish_for(2.seconds)