[#345] fix stubbing redis

spec/models/advisory_spec.rb

@@ -17,7 +17,7 @@ shared_examples_for 'attach advisory to build_list' do
 end
 
 describe Advisory do
-  before { stub_symlink_methods }
+  before { stub_symlink_methods; stub_redis }
   context 'attach_build_list' do
     let(:build_list) { FactoryGirl.create(:build_list) }
 

spec/models/build_list/package_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe BuildList::Package do
-  before { stub_symlink_methods }
+  before { stub_symlink_methods; stub_redis }
 
   it 'is valid' do
     FactoryGirl.create(:build_list_package).should be_persisted

spec/models/build_list_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe BuildList do
-  before { stub_symlink_methods }
+  before { stub_symlink_methods; stub_redis }
 
   context 'validates that repository contains project' do
     it 'when repository contains project' do

spec/models/comment_for_commit_spec.rb

@@ -38,7 +38,7 @@ def should_not_send_email(args={})
 end
 
 describe Comment do
-  before { stub_symlink_methods }
+  before { stub_symlink_methods; stub_redis }
   context 'for global admin user' do
     before(:each) do
       @user = FactoryGirl.create(:admin)

spec/models/project_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Project do
-  before { stub_symlink_methods }
+  before { stub_symlink_methods; stub_redis }
 
   context 'creation' do
     let(:root_project) { FactoryGirl.create(:project) }
@@ -102,7 +102,6 @@ describe Project do
     let(:branch) { project.repo.branches.detect{|b| b.name == 'conflicts'} }
     let(:master) { project.repo.branches.detect{|b| b.name == 'master'} }
     let(:user) { FactoryGirl.create(:user) }
-    before { stub_redis }
 
     context '#delete_branch' do
       it 'ensures that returns true on success' do

spec/spec_helper.rb

@@ -64,8 +64,8 @@ end
 
 def stub_redis
   @redis_instance = MockRedis.new
-  allow(Redis).to receive(:new).and_return(@redis_instance)
-  allow(Resque).to receive(:redis).and_return(@redis_instance)
+  Redis.stub(:new).and_return { @redis_instance }
+  Redis::Store.stub(:new).and_return { @redis_instance }
 end
 
 def fill_project project