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.

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

Conversation

dnkoutso
Copy link
Contributor

This is now correct.

@@ -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.

@@ -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.

👍

@dnkoutso dnkoutso requested a review from orta June 10, 2017 17:58
@@ -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
Member

Choose a reason for hiding this comment

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

👍

@orta orta merged commit dae60a3 into CocoaPods:master Jun 12, 2017
@dnkoutso dnkoutso deleted the fix_test_specs_parsing branch June 12, 2017 14:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants