fix for some crazy lack-of-stubbing on some http requests...
This commit is contained in:
parent
f7e09df49b
commit
3d569cc4bc
4 changed files with 5 additions and 12 deletions
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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!
|
||||
|
|
|
|||
|
|
@ -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"]
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue