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

Remove alamoRequest.cancel() from stubbing closure #1841

Merged
merged 4 commits into from May 1, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 1 addition & 7 deletions .circleci/config.yml
Expand Up @@ -22,9 +22,6 @@ jobs:
- run:
name: Set Ruby Version
command: echo "ruby-2.4" > ~/.ruby-version
- run:
name: Update Homebrew
command: brew update
- run:
name: Carthage checkout
command: carthage checkout
Expand All @@ -47,12 +44,9 @@ jobs:
- run:
name: Set Ruby Version
command: echo "ruby-2.4" > ~/.ruby-version
- run:
name: Update Homebrew
command: brew update
- run:
name: Install Swiftlint
command: brew install swiftlint
command: git clone git@github.com:realm/SwiftLint.git && cd SwiftLint && git submodule update --init --recursive && make install && cd ../
Copy link
Member

Choose a reason for hiding this comment

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

Hey :)) Have you considered use Mint here?

Copy link
Member Author

Choose a reason for hiding this comment

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

That's a good point @LucianoPAlmeida. I just didn't want to add another dependency to CI in this PR. We may discuss potential updates to the CI script, as it needs refreshing anyways.

Copy link
Member

Choose a reason for hiding this comment

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

Sure, that makes sense, I just raised the point because it appears to be a simpler script :) Also we could avoid having to clone all source and compile it, iff mint supports just download the binary(not sure if it does).

- run:
name: Add Python directory to PATH
command: echo 'export PATH=~/Library/Python/2.7/bin:$PATH' >> $BASH_ENV
Expand Down
1 change: 0 additions & 1 deletion Sources/Moya/MoyaProvider+Internal.swift
Expand Up @@ -157,7 +157,6 @@ public extension MoyaProvider {
final func notifyPluginsOfImpendingStub(for request: URLRequest, target: Target) {
let alamoRequest = manager.request(request as URLRequestConvertible)
plugins.forEach { $0.willSend(alamoRequest, target: target) }
alamoRequest.cancel()
}
}

Expand Down