Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correctly include parent dependencies when parsing testspecs #384

Merged
merged 1 commit into from
Jun 12, 2017
Merged

Correctly include parent dependencies when parsing testspecs #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@

##### Bug Fixes

* Correctly include parent dependencies when parsing testspecs
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#384](https://github.com/CocoaPods/Core/pull/384)

* Fix typo in `specification.rb`
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#376](https://github.com/CocoaPods/Core/pull/376)
Expand Down
6 changes: 3 additions & 3 deletions lib/cocoapods-core/podfile/target_definition.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,8 +852,8 @@ def parse_configuration_whitelist(name, requirements)
requirements.pop if options.empty?
end

# Removes :subspecs from the requirements list, and stores the pods
# with the given subspecs as dependencies.
# Removes :subspecs and :testspecs from the requirements list, and stores the pods
# with the given subspecs or test specs as dependencies.
#
# @param [String] name
#
Expand All @@ -879,7 +879,7 @@ def parse_subspecs(name, requirements)
end if test_specs

requirements.pop if options.empty?
!subspecs.nil? || !test_specs.nil?
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should not include test specs here because if this method returns true then only the test specs are being parsed.

!subspecs.nil?
end

#-----------------------------------------------------------------------#
Expand Down
4 changes: 2 additions & 2 deletions spec/podfile/target_definition_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,13 +234,13 @@ module Pod

it 'allows depending on testspecs' do
@parent.store_pod('RestKit', :testspecs => %w(Tests))
@parent.dependencies.map(&:name).sort.should == %w(RestKit/Tests)
@parent.dependencies.map(&:name).sort.should == %w(RestKit RestKit/Tests)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now this is correct! If I ask for the test spec 'Tests' I still want RestKit to be included.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

end

it 'allows depending on both subspecs and testspecs' do
@parent.store_pod('RestKit', :subspecs => %w(Networking))
@parent.store_pod('RestKit', :testspecs => %w(Tests))
@parent.dependencies.map(&:name).sort.should == %w(RestKit/Networking RestKit/Tests)
@parent.dependencies.map(&:name).sort.should == %w(RestKit RestKit/Networking RestKit/Tests)
end

it 'allows depending on both subspecs and testspecs in chaining' do
Expand Down