From 3d569cc4bcb583444525ba31650f7db0cc016369 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Thu, 9 Feb 2012 16:19:57 -0800
Subject: [PATCH] fix for some crazy lack-of-stubbing on some http requests...

---
 config/application.yml.example  | 1 +
 spec/models/user_spec.rb        | 8 --------
 spec/spec_helper.rb             | 7 +++----
 spec/support/fixture_builder.rb | 1 +
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/config/application.yml.example b/config/application.yml.example
index fd9b0c425..aeaf5fe0e 100644
--- a/config/application.yml.example
+++ b/config/application.yml.example
@@ -207,6 +207,7 @@ test:
   pod_url: "http://localhost:9887/"
   socket_port: 8081
   open_invitations: true
+  no_follow_diasporahq: true
   serve_static_assets: true
 
 integration_1:
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 8e54593e1..e7c765965 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -298,14 +298,6 @@ describe User do
     end
   end
 
-  describe '#seed_aspects' do
-    it 'follows the default account' do
-      Webfinger.stub_chain(:new, :fetch).and_return(Factory(:person))
-      expect{
-       eve.seed_aspects
-      }.to change(eve.contacts, :count).by(1)
-    end
-  end
 
   describe ".build" do
     context 'with valid params' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6e22953ef..071338a7f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,8 +10,6 @@ require 'rspec/rails'
 require 'webmock/rspec'
 require 'factory_girl'
 
-include WebMock::API
-WebMock::Config.instance.allow_localhost = false
 include HelperMethods
 
 # Force fixture rebuild
@@ -33,7 +31,7 @@ RSpec.configure do |config|
   config.before(:each) do
     I18n.locale = :en
     stub_request(:post, "https://pubsubhubbub.appspot.com/")
-
+    disable_typhoeus
     $process_queue = false
   end
 
@@ -50,8 +48,9 @@ Dir["#{File.dirname(__FILE__)}/shared_behaviors/**/*.rb"].each do |f|
   require f
 end
 
-disable_typhoeus
+
 ProcessedImage.enable_processing = false
+UnprocessedImage.enable_processing = false
 
 AppConfig.load!
 AppConfig.setup!
diff --git a/spec/support/fixture_builder.rb b/spec/support/fixture_builder.rb
index 20e0376c1..d2daa6b5e 100644
--- a/spec/support/fixture_builder.rb
+++ b/spec/support/fixture_builder.rb
@@ -1,6 +1,7 @@
 require File.join(File.dirname(__FILE__), "user_methods.rb")
 
 FixtureBuilder.configure do |fbuilder|
+
   # rebuild fixtures automatically when these files change:
   fbuilder.files_to_check += Dir["app/models/*.rb", "lib/**/*.rb",  "spec/factories/*.rb", "spec/support/fixture_builder.rb"]