From 756bacac314e2f481f49f576f7fc1583a87bcfd4 Mon Sep 17 00:00:00 2001 From: Stewart McKee Date: Sat, 24 Jan 2015 11:47:27 +0000 Subject: [PATCH] updated some env logic for specs --- lib/sidekiq/cobweb_helper.rb | 4 ++-- spec/spec_helper.rb | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/sidekiq/cobweb_helper.rb b/lib/sidekiq/cobweb_helper.rb index 9b3292c..87bad9f 100644 --- 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 index 541791e..04bfc37 100644 --- 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 }