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

Fix social media validation for Twitter #9053

Merged
merged 5 commits into from
Jul 30, 2019
Merged

Fix social media validation for Twitter #9053

merged 5 commits into from
Jul 30, 2019

Conversation

abbeycode
Copy link
Contributor

Using change from CocoaPods/Core#571 to address Issue #9049

@@ -450,7 +450,7 @@ def validate_screenshots(spec)
# Performs validations related to the `social_media_url` attribute.
#
def validate_social_media_url(spec)
validate_url(spec.social_media_url) if spec.social_media_url
validate_url(spec.social_media_url, 'Not a Browser') if spec.social_media_url
Copy link
Contributor

Choose a reason for hiding this comment

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

should this be 'CocoaPods' or is this standard practice for unknown/placeholder user agents?

@@ -416,7 +416,7 @@ def perform_extensive_subspec_analysis(spec)

# Performs validation of a URL
#
def validate_url(url)
def validate_url(url, user_agent=nil)
Copy link
Contributor

Choose a reason for hiding this comment

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

nit formatting: user_agent = nil

I think Rubocop will catch that anyway.

@dnkoutso dnkoutso added this to the 1.8.0 milestone Jul 29, 2019
@abbeycode abbeycode changed the base branch from 1-7-stable to master July 30, 2019 03:09
@abbeycode
Copy link
Contributor Author

I'll take a look at the broken test specs tomorrow.

@abbeycode
Copy link
Contributor Author

@dnkoutso This is all set now, if you'd like to review again.

@dnkoutso
Copy link
Contributor

@abbeycode the Core PR has been merged please update the Gemfile.lock to point to the right SHA and not your fork and we can merge this!

@dnkoutso
Copy link
Contributor

Also please squash into a single commit.

@abbeycode
Copy link
Contributor Author

@dnkoutso I'm curious what the reason for squashing is, since GitHub lets you squash when you merge. I'm happy to do it, but I was curious if there's a reason that applies to the projects I maintain.

@dnkoutso
Copy link
Contributor

No big reason its just that I forget to update the merge mode :) sorry

@abbeycode
Copy link
Contributor Author

All set, once the checks complete.

@dnkoutso
Copy link
Contributor

Looks like there was no squash anyway i will make sure its squashes into a single commit once merging.

@dnkoutso dnkoutso merged commit e773b02 into CocoaPods:master Jul 30, 2019
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.

2 participants