Skip to content

Commit

Permalink
Update webmock, faraday (#16853)
Browse files Browse the repository at this point in the history
* [fastlane] Update webmock to 3.8

Changelog:
https://github.com/bblimke/webmock/blob/v3.8.3/CHANGELOG.md

SemVer stability:
https://dependabot.com/compatibility-score.html/?dependency-name=webmock&package-manager=bundler&version-scheme=semver

* [fastlane] Update faraday to 1.x

Updating webmock to 3.x made it possible to use faraday 1.x.

Faraday corrected a bug in handling empty arrays in params, hence the
necessary changes in the stubbing. See:
lostisland/faraday#1084
  • Loading branch information
aried3r committed Jul 16, 2020
1 parent 666c91b commit a68011c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
11 changes: 3 additions & 8 deletions fastlane.gemspec
Expand Up @@ -76,12 +76,8 @@ Gem::Specification.new do |spec|
spec.add_dependency('commander-fastlane', '>= 4.4.6', '< 5.0.0') # CLI parser
spec.add_dependency('excon', '>= 0.71.0', '< 1.0.0') # Great HTTP Client
spec.add_dependency('faraday-cookie_jar', '~> 0.0.6')
# The faraday gem is used for deploygate, hockey and testfairy actions.
# Locked under 1.0 until webmock 3.6.0 can be used to handle empty array
# parameters https://github.com/bblimke/webmock/blob/master/CHANGELOG.md#360,
# probably.
spec.add_dependency('faraday', '>= 0.17', '< 1.0')
spec.add_dependency('faraday_middleware', '>= 0.13.1', '< 2.0') # Same as faraday
spec.add_dependency('faraday', '~> 1.0') # The faraday gem is used for deploygate, hockey and testfairy actions.
spec.add_dependency('faraday_middleware', '~> 1.0') # Same as faraday
spec.add_dependency('fastimage', '>= 2.1.0', '< 3.0.0') # fetch the image sizes from the screenshots
spec.add_dependency('gh_inspector', '>= 1.1.2', '< 2.0.0') # search for issues on GitHub when something goes wrong
spec.add_dependency('highline', '>= 1.7.2', '< 2.0.0') # user inputs (e.g. passwords)
Expand Down Expand Up @@ -113,8 +109,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency('pry-rescue')
spec.add_development_dependency('pry-stack_explorer')
spec.add_development_dependency('yard', '~> 0.9.11')
spec.add_development_dependency('webmock', '~> 2.3.2')
spec.add_development_dependency('hashdiff', '< 0.4.0') # Locked under 0.4.0 until webmock bumped up to 3.6.0 or greater - HashDiff was changed to Hashdiff
spec.add_development_dependency('webmock', '~> 3.8')
spec.add_development_dependency('coveralls', '~> 0.8.13')
spec.add_development_dependency('rubocop', Fastlane::RUBOCOP_REQUIREMENT)
spec.add_development_dependency('rubocop-require_tools', '>= 0.1.2')
Expand Down
4 changes: 2 additions & 2 deletions spaceship/spec/portal/portal_stubbing.rb
Expand Up @@ -20,7 +20,7 @@ def adp_enterprise_stubbing
to_return(status: 200, body: adp_read_fixture_file(File.join("enterprise", "listCertRequests.action.json")), headers: { 'Content-Type' => 'application/json' })

stub_request(:post, "https://developer.apple.com/services-account/QH65B2/account/ios/profile/createProvisioningProfile.action").
with(body: { "appIdId" => "2UMR2S6PAA", "certificateIds" => "Q82WC5JRE9", "distributionType" => "inhouse", "provisioningProfileName" => "Delete Me", "teamId" => "XXXXXXXXXX" }).
with(body: { "appIdId" => "2UMR2S6PAA", "certificateIds" => "Q82WC5JRE9", "deviceIds" => "", "distributionType" => "inhouse", "provisioningProfileName" => "Delete Me", "teamId" => "XXXXXXXXXX" }).
to_return(status: 200, body: adp_read_fixture_file('create_profile_success.json'), headers: { 'Content-Type' => 'application/json' })
end

Expand Down Expand Up @@ -97,7 +97,7 @@ def adp_stub_provisioning

# Profile with template
stub_request(:post, "https://developer.apple.com/services-account/QH65B2/account/ios/profile/createProvisioningProfile.action").
with(body: { "appIdId" => "R9YNDTPLJX", "certificateIds" => "C8DL7464RQ", "distributionType" => "limited", "provisioningProfileName" => "net.sunapps.106 limited", "teamId" => "XXXXXXXXXX", "template" => "Subscription Service iOS (dist)" }).
with(body: { "appIdId" => "R9YNDTPLJX", "certificateIds" => "C8DL7464RQ", "deviceIds" => "", "distributionType" => "limited", "provisioningProfileName" => "net.sunapps.106 limited", "teamId" => "XXXXXXXXXX", "template" => "Subscription Service iOS (dist)" }).
to_return(status: 200, body: adp_read_fixture_file('create_profile_with_template_success.json'), headers: { 'Content-Type' => 'application/json' })

# Repair Profiles
Expand Down

0 comments on commit a68011c

Please sign in to comment.