Commit 5ded667c authored by Fabio Pelosin's avatar Fabio Pelosin

Merge branch 'master' into integration_take_2

* master:
  [Specs] Fix for master repo changes
parents f0045086 49eafba9
...@@ -67,7 +67,7 @@ module Pod ...@@ -67,7 +67,7 @@ module Pod
it "resolves subspecs" do it "resolves subspecs" do
@podfile = Podfile.new do @podfile = Podfile.new do
platform :ios platform :ios
pod 'RestKit/Network' pod 'RestKit/Network', '0.10.3'
pod 'RestKit/ObjectMapping/XML' pod 'RestKit/ObjectMapping/XML'
end end
resolver = Resolver.new(@podfile, nil, stub('sandbox')) resolver = Resolver.new(@podfile, nil, stub('sandbox'))
...@@ -88,7 +88,7 @@ module Pod ...@@ -88,7 +88,7 @@ module Pod
it "includes all the subspecs of a specification node" do it "includes all the subspecs of a specification node" do
@podfile = Podfile.new do @podfile = Podfile.new do
platform :ios platform :ios
pod 'RestKit' pod 'RestKit', '0.10.3'
end end
resolver = Resolver.new(@podfile, nil, stub('sandbox')) resolver = Resolver.new(@podfile, nil, stub('sandbox'))
resolver.resolve.values.flatten.map(&:name).sort.should == %w{ resolver.resolve.values.flatten.map(&:name).sort.should == %w{
......
...@@ -69,9 +69,9 @@ describe "Pod::Source" do ...@@ -69,9 +69,9 @@ describe "Pod::Source" do
end end
it "searches the sets specifing a dependency on a subspec" do it "searches the sets specifing a dependency on a subspec" do
dep = Pod::Dependency.new('RestKit/JSON') dep = Pod::Dependency.new('ShareKit/Evernote')
set = Pod::Source.search(dep) set = Pod::Source.search(dep)
set.name.should == 'RestKit' set.name.should == 'ShareKit'
set.sources.map(&:name).should == %w| master | set.sources.map(&:name).should == %w| master |
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