feat: allow passing a function to enableNetConnect()#1889
Merged
mastermatt merged 5 commits intonock:betafrom Feb 11, 2020
Merged
feat: allow passing a function to enableNetConnect()#1889mastermatt merged 5 commits intonock:betafrom
enableNetConnect()#1889mastermatt merged 5 commits intonock:betafrom
Conversation
nikaspran
commented
Feb 10, 2020
| } else if (matcher instanceof RegExp) { | ||
| allowNetConnect = matcher | ||
| } else if (matcher instanceof Function) { | ||
| allowNetConnect = { test: matcher } |
Contributor
Author
There was a problem hiding this comment.
I could also make the internal variable a function, but this seemed quite elegant - let me know if you want me to change this.
nikaspran
commented
Feb 10, 2020
tests/test_net_connect.js
Outdated
| await assertRejects( | ||
| got('https://other.example.test/'), | ||
| Error, | ||
| 'Nock: Disallowed net connect for "other.example.test:443/"' |
Contributor
Author
There was a problem hiding this comment.
This is the bug I mentioned in the PR description - this last parameter is used for displaying a message when the assertion fails, not to check the error itself.
Member
paulmelnikow
left a comment
There was a problem hiding this comment.
This looks great! Nock already has a big API so it’s worth considering carefully before adding even more, though I think this is one is worth it! If we do change the way we handle configuring the unmocked behavior, this might change, though using a function for this seems like the nicest way to express more complicated scenarios than anything else we’ve seen.
paulmelnikow
approved these changes
Feb 10, 2020
|
|
||
| await got('https://example.test/').catch(() => undefined) // ignore rejection, expected | ||
|
|
||
| expect(matcher).to.have.been.calledOnceWithExactly('example.test:443') |
paulmelnikow
pushed a commit
that referenced
this pull request
Feb 10, 2020
As mentioned in #1889, it appears that `assertRejects` is not currently used correctly - the third parameter is the message that the assertion emits if it fails, not a matcher for the exception text. This PR fixes all usages of `assertRejects` to correct expect on the error message.
enableNetConnect()
mastermatt
approved these changes
Feb 11, 2020
Member
mastermatt
left a comment
There was a problem hiding this comment.
Even included updates to the types!
Member
|
Should we send this out as a minor version, or merge it into |
Member
|
nvm, I just saw this comment #1896 (comment) I'll update the base branch and bring it up to date. |
|
🎉 This PR is included in version 11.9.0-beta.1 🎉 The release is available on: Your semantic-release bot 📦🚀 |
mastermatt
pushed a commit
to mastermatt/nock
that referenced
this pull request
Feb 12, 2020
* feat(1861): allow passing a function to enableNetConnect * Add test to cover passed parameters
paulmelnikow
pushed a commit
that referenced
this pull request
Feb 13, 2020
* feat(1861): allow passing a function to enableNetConnect * Add test to cover passed parameters
gr2m
pushed a commit
that referenced
this pull request
Feb 16, 2020
* feat(1861): allow passing a function to enableNetConnect * Add test to cover passed parameters
gr2m
pushed a commit
that referenced
this pull request
Feb 16, 2020
* feat(1861): allow passing a function to enableNetConnect * Add test to cover passed parameters
gr2m
pushed a commit
that referenced
this pull request
Feb 16, 2020
* feat(1861): allow passing a function to enableNetConnect * Add test to cover passed parameters
gr2m
pushed a commit
that referenced
this pull request
Feb 16, 2020
* feat(1861): allow passing a function to enableNetConnect * Add test to cover passed parameters
gr2m
pushed a commit
that referenced
this pull request
Feb 16, 2020
* feat(1861): allow passing a function to enableNetConnect * Add test to cover passed parameters
This was referenced Mar 26, 2020
juninmd
pushed a commit
to juninmd/nock
that referenced
this pull request
Mar 21, 2026
As mentioned in nock#1889, it appears that `assertRejects` is not currently used correctly - the third parameter is the message that the assertion emits if it fails, not a matcher for the exception text. This PR fixes all usages of `assertRejects` to correct expect on the error message.
juninmd
pushed a commit
to juninmd/nock
that referenced
this pull request
Mar 21, 2026
* feat(1861): allow passing a function to enableNetConnect * Add test to cover passed parameters
juninmd
pushed a commit
to juninmd/nock
that referenced
this pull request
Mar 21, 2026
* feat(1861): allow passing a function to enableNetConnect * Add test to cover passed parameters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #1861
I've also uncovered a bug in the usage of
assertRejects- the third parameter is not used by the library to match on the error message, but rather the message to print when the expected rejection does not happen. I will create a separate PR to fix all usages ofassertRejectsin the project.