From 5a7c52e8e916e34aa4378eecb7b6c292a4371a00 Mon Sep 17 00:00:00 2001
From: Kevin Bedell <kbedell@zipcar.com>
Date: Tue, 12 Nov 2013 15:54:16 -0500
Subject: [PATCH] fix issues with jruby failing tests

---
 test/test_middleware.rb |  2 +-
 test/test_processor.rb  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/test_middleware.rb b/test/test_middleware.rb
index 36e15eb3..ac03134c 100644
--- a/test/test_middleware.rb
+++ b/test/test_middleware.rb
@@ -82,7 +82,7 @@ class TestMiddleware < Sidekiq::Test
       processor = Sidekiq::Processor.new(boss)
       actor = Minitest::Mock.new
       actor.expect(:processor_done, nil, [processor])
-      actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+      actor.expect(:real_thread, nil, [nil, Thread])
       boss.expect(:async, actor, [])
       boss.expect(:async, actor, [])
       processor.process(Sidekiq::BasicFetch::UnitOfWork.new('queue:default', msg))
diff --git a/test/test_processor.rb b/test/test_processor.rb
index 48f76ac0..0ae70c06 100644
--- a/test/test_processor.rb
+++ b/test/test_processor.rb
@@ -31,7 +31,7 @@ class TestProcessor < Sidekiq::Test
       msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['myarg'] })
       actor = Minitest::Mock.new
       actor.expect(:processor_done, nil, [@processor])
-      actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+      actor.expect(:real_thread, nil, [nil, Thread])
       @boss.expect(:async, actor, [])
       @boss.expect(:async, actor, [])
       @processor.process(work(msg))
@@ -41,7 +41,7 @@ class TestProcessor < Sidekiq::Test
 
     it 'passes exceptions to ExceptionHandler' do
       actor = Minitest::Mock.new
-      actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+      actor.expect(:real_thread, nil, [nil, Thread])
       @boss.expect(:async, actor, [])
       msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
       begin
@@ -57,7 +57,7 @@ class TestProcessor < Sidekiq::Test
       msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
       re_raise = false
       actor = Minitest::Mock.new
-      actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+      actor.expect(:real_thread, nil, [nil, Thread])
       @boss.expect(:async, actor, [])
 
       begin
@@ -75,7 +75,7 @@ class TestProcessor < Sidekiq::Test
       processor = ::Sidekiq::Processor.new(@boss)
       actor = Minitest::Mock.new
       actor.expect(:processor_done, nil, [processor])
-      actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+      actor.expect(:real_thread, nil, [nil, Thread])
       @boss.expect(:async, actor, [])
       @boss.expect(:async, actor, [])
       processor.process(work(msgstr))
@@ -103,7 +103,7 @@ class TestProcessor < Sidekiq::Test
         def successful_job
           msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['myarg'] })
           actor = Minitest::Mock.new
-          actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+          actor.expect(:real_thread, nil, [nil, Thread])
           actor.expect(:processor_done, nil, [@processor])
           @boss.expect(:async, actor, [])
           @boss.expect(:async, actor, [])
@@ -131,7 +131,7 @@ class TestProcessor < Sidekiq::Test
 
         def failed_job
           actor = Minitest::Mock.new
-          actor.expect(:real_thread, nil, [nil, Celluloid::Thread])
+          actor.expect(:real_thread, nil, [nil, Thread])
           @boss.expect(:async, actor, [])
           msg = Sidekiq.dump_json({ 'class' => MockWorker.to_s, 'args' => ['boom'] })
           begin