Commit 742e7dab authored by Samuel Giddins's avatar Samuel Giddins

Allow resetting Config.instance within a spec

parent 2cb671fa
...@@ -55,14 +55,10 @@ require 'spec_helper/webmock' # Cleans up mocks after each spec ...@@ -55,14 +55,10 @@ require 'spec_helper/webmock' # Cleans up mocks after each spec
# #
module Pod module Pod
class Specification class Specification
alias_method :original_source, :source
def source def source
fixture = SpecHelper.fixture("integration/#{name}") fixture = SpecHelper.fixture("integration/#{name}")
result = super result = super
if fixture.exist? result[:git] = fixture.to_s if fixture.exist?
# puts "Using fixture [#{name}]"
result[:git] = fixture.to_s
end
result result
end end
end end
...@@ -99,6 +95,17 @@ module SpecHelper ...@@ -99,6 +95,17 @@ module SpecHelper
def self.temporary_directory def self.temporary_directory
ROOT + 'tmp' ROOT + 'tmp'
end end
def self.reset_config_instance
::Pod::Config.instance = nil
::Pod::Config.instance.tap do |c|
c.verbose = false
c.silent = true
c.repos_dir = fixture('spec-repos')
c.installation_root = SpecHelper.temporary_directory
c.cache_root = SpecHelper.temporary_directory + 'Cache'
end
end
end end
def temporary_sandbox def temporary_sandbox
......
...@@ -5,14 +5,7 @@ module Bacon ...@@ -5,14 +5,7 @@ module Bacon
old_run_requirement = instance_method(:run_requirement) old_run_requirement = instance_method(:run_requirement)
define_method(:run_requirement) do |description, spec| define_method(:run_requirement) do |description, spec|
::Pod::Config.instance = nil ::SpecHelper.reset_config_instance
::Pod::Config.instance.tap do |c|
c.verbose = false
c.silent = true
c.repos_dir = fixture('spec-repos')
c.installation_root = SpecHelper.temporary_directory
c.cache_root = SpecHelper.temporary_directory + 'Cache'
end
::Pod::UI.output = '' ::Pod::UI.output = ''
::Pod::UI.warnings = '' ::Pod::UI.warnings = ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment