Merge be39483 into 25d17b8

resque · Jun 4, 2013 · 42dd7db · 42dd7db
2 parents 25d17b8 + be39483
commit 42dd7db
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/resque.rb b/lib/resque.rb
@@ -123,10 +123,11 @@ def inline(&block)
   end
 
   def inline_block
+    old_inline = inline?
     self.inline = true
     yield
   ensure
-    self.inline = false
+    self.inline = old_inline
   end
 
   def inline?

diff --git a/test/legacy/resque_test.rb b/test/legacy/resque_test.rb
@@ -307,6 +307,16 @@
     assert !Resque.inline?
   end
 
+  it "inline block doesn't change inline to false if already inline" do
+    begin
+      Resque.inline = true
+      Resque.inline { }
+      assert Resque.inline?
+    ensure
+      Resque.inline = false
+    end
+  end
+
   it "inline without block is alias to inline?" do
     begin
       assert_equal Resque.inline?, Resque.inline