Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
5ded667c
Commit
5ded667c
authored
Feb 11, 2013
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into integration_take_2
* master: [Specs] Fix for master repo changes
parents
f0045086
49eafba9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
resolver_spec.rb
spec/unit/resolver_spec.rb
+2
-2
source_spec.rb
spec/unit/source_spec.rb
+2
-2
No files found.
spec/unit/resolver_spec.rb
View file @
5ded667c
...
@@ -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{
...
...
spec/unit/source_spec.rb
View file @
5ded667c
...
@@ -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
==
'
Rest
Kit'
set
.
name
.
should
==
'
Share
Kit'
set
.
sources
.
map
(
&
:name
).
should
==
%w| master |
set
.
sources
.
map
(
&
:name
).
should
==
%w| master |
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment