updated some env logic for specs

stewartmckee · Jan 24, 2015 · 756baca · 756baca
1 parent acb599f
commit 756baca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/sidekiq/cobweb_helper.rb b/lib/sidekiq/cobweb_helper.rb
@@ -4,14 +4,14 @@
   require 'sidekiq'
 else
   SIDEKIQ_INSTALLED = false
-  puts "sidekiq gem not installed, skipping crawl_worker specs"
+  puts "sidekiq gem not installed, skipping crawl_worker specs" if defined?(ENVIRONMENT) && ENVIRONMENT=="test"
 end
 if Gem::Specification.find_all_by_name("resque", ">=1.0.0").count >= 1
   RESQUE_INSTALLED = true
   require 'resque'
 else
   RESQUE_INSTALLED = false
-  puts "resque gem not installed, skipping crawl_job specs"
+  puts "resque gem not installed, skipping crawl_job specs" if defined?(ENVIRONMENT) && ENVIRONMENT=="test"
 end
 
 module Sidekiq

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -37,10 +37,11 @@
 
   config.before(:each) {
 
-    #redis_mock = double("redis")
-    #redis_mock.stub(:new).and_return(@redis_mock_object)
+    @redis_mock_object = MockRedis.new
+    Redis.stub(:new).and_return(@redis_mock_object)
+    Redis::Namespace.stub(:new).and_return(@redis_mock_object)
 
-    #redis_mock.flushdb
+    @redis_mock_object.flushdb
 
   }