Unverified Commit 3e27274c authored by Samuel Giddins's avatar Samuel Giddins Committed by GitHub

Merge pull request #7385 from CocoaPods/seg-local-podspec-cleanup

[Sandbox] Clean up usage of #local?
parents 2b4de852 f3d6ae6e
......@@ -651,7 +651,7 @@ module Pod
#
def development_pod_targets
pod_targets.select do |pod_target|
sandbox.development_pods.keys.include?(pod_target.pod_name)
sandbox.local?(pod_target.pod_name)
end
end
......
......@@ -277,7 +277,7 @@ module Pod
#
def development_pod_targets
pod_targets.select do |pod_target|
sandbox.development_pods.keys.include?(pod_target.pod_name)
sandbox.local?(pod_target.pod_name)
end
end
......
......@@ -389,9 +389,7 @@ module Pod
#
def local_podspec(name)
root_name = Specification.root_name(name)
if path = development_pods[root_name]
Pathname.new(path)
end
development_pods[root_name]
end
#-------------------------------------------------------------------------#
......
......@@ -438,7 +438,7 @@ module Pod
pod_target = fixture_pod_target(spec)
@generator.stubs(:pod_targets).returns([pod_target])
@generator.sandbox.stubs(:development_pods).returns('BananaLib' => nil)
@generator.sandbox.stubs(:development_pods).returns('BananaLib' => fixture('BananaLib'))
end
it 'does not share by default' do
......@@ -468,7 +468,7 @@ module Pod
returns(true)
@generator.stubs(:pod_targets).returns([pod_target])
@generator.sandbox.stubs(:development_pods).returns('CoconutLib' => nil)
@generator.sandbox.stubs(:development_pods).returns('CoconutLib' => fixture('CoconutLib'))
Xcodeproj::XCScheme.expects(:share_scheme).with(
@generator.project.path,
......
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