Commit f3e12ba3 authored by Fabio Pelosin's avatar Fabio Pelosin

[Specs] Fix issue that lead to generation of files in the fixtures folder.

parent c5d13de4
...@@ -4,7 +4,6 @@ module Pod ...@@ -4,7 +4,6 @@ module Pod
describe Installer do describe Installer do
before do before do
config.repos_dir = fixture('spec-repos') config.repos_dir = fixture('spec-repos')
config.project_pods_root = fixture('integration')
end end
describe "by default" do describe "by default" do
...@@ -15,10 +14,14 @@ module Pod ...@@ -15,10 +14,14 @@ module Pod
pod 'JSONKit' pod 'JSONKit'
end end
sandbox = Sandbox.new(fixture('integration')) @sandbox = temporary_sandbox
resolver = Resolver.new(podfile, nil, sandbox) config.project_pods_root = temporary_sandbox.root
target_installer = Installer.new(resolver).target_installers.first FileUtils.cp_r(fixture('integration/JSONKit'), @sandbox.root + 'JSONKit')
target_installer.generate_xcconfig([], sandbox)
resolver = Resolver.new(podfile, nil, @sandbox)
@installer = Installer.new(resolver)
target_installer = @installer.target_installers.first
target_installer.generate_xcconfig([], @sandbox)
@xcconfig = target_installer.xcconfig.to_hash @xcconfig = target_installer.xcconfig.to_hash
end end
...@@ -40,8 +43,8 @@ module Pod ...@@ -40,8 +43,8 @@ module Pod
pod 'ASIHTTPRequest' pod 'ASIHTTPRequest'
end end
sandbox = Sandbox.new(fixture('integration')) FileUtils.cp_r(fixture('integration/ASIHTTPRequest'), @sandbox.root + 'ASIHTTPRequest')
resolver = Resolver.new(podfile, nil, sandbox) resolver = Resolver.new(podfile, nil, @sandbox)
installer = Installer.new(resolver) installer = Installer.new(resolver)
pods = installer.specifications.map do |spec| pods = installer.specifications.map do |spec|
LocalPod.new(spec, installer.sandbox, podfile.target_definitions[:default].platform) LocalPod.new(spec, installer.sandbox, podfile.target_definitions[:default].platform)
...@@ -58,7 +61,7 @@ module Pod ...@@ -58,7 +61,7 @@ module Pod
pod 'JSONKit' pod 'JSONKit'
end end
end end
resolver = Resolver.new(podfile, nil, Sandbox.new(fixture('integration'))) resolver = Resolver.new(podfile, nil, @sandbox)
installer = Installer.new(resolver) installer = Installer.new(resolver)
installer.target_installers.map(&:target_definition).map(&:name).should == [:not_empty] installer.target_installers.map(&:target_definition).map(&:name).should == [:not_empty]
end end
......
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