@BugFix execute tests with any version of resque_unit

rlivsey · Jan 7, 2011 · e6f8acd · e6f8acd
1 parent 92bf7ab
commit e6f8acd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/test/distributed_index_creation_test.rb b/test/distributed_index_creation_test.rb
@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'resque_unit'
 
 require File.dirname(__FILE__) + '/test_helper.rb'
 
@@ -9,6 +8,7 @@
 class DistributedIndexCreation < Test::Unit::TestCase
 
   load_schema
+  resque_available
   class User < ActiveRecord::Base
     elastic_index :updates => false
   end

diff --git a/test/nrt_enqueue_test.rb b/test/nrt_enqueue_test.rb
@@ -1,19 +1,19 @@
 # tests the Near Real Time support in the :updates => true mode
 
 require 'test_helper'
-require 'resque_unit'
+
 
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class NrtEnqueue < Test::Unit::TestCase
   load_schema
+  resque_available
 
   class User < ActiveRecord::Base
     elastic_index :updates => :enqueue
   end
 
   def setup
-    Resque.reset!
     User.delete_all
     Escargot::LocalIndexing.create_index_for_model(User)
 

diff --git a/test/nrt_immediate_test.rb b/test/nrt_immediate_test.rb
@@ -5,6 +5,7 @@
 
 class NrtImmediate < Test::Unit::TestCase
   load_schema
+  resque_available
 
   class User < ActiveRecord::Base
     elastic_index

diff --git a/test/nrt_immediate_with_refresh_test.rb b/test/nrt_immediate_with_refresh_test.rb
@@ -5,6 +5,7 @@
 
 class NrtImmediateWithRefreshTest < Test::Unit::TestCase
   load_schema
+  resque_available
 
   class User < ActiveRecord::Base
     elastic_index :updates => :immediate_with_refresh

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -48,8 +48,9 @@ def load_schema
 
 def resque_available
   begin
-    Resque
+    require 'resque'
     require 'resque_unit'
+    Resque.reset!
     return true
   rescue NameError, MissingSourceFile
     puts "Please install the 'resque' and 'resque_unit' gems to test the distributed mode."