yield_control hardening #1167
Merged
yield_control hardening #1167
Conversation
This file contains 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
marcandre
force-pushed
the
yield_control_hardening
branch
from
6c23382
to
6e9f6c3
Compare
JonRowe
requested changes
Mar 17, 2020
marcandre
force-pushed
the
yield_control_hardening
branch
from
6e9f6c3
to
b3c7629
Compare
JonRowe
requested changes
Mar 17, 2020
…t_most Currently, `exactly(:trice)` would always provide a failure with message 'expected given block to yield control', even if control was yielded. `at_least(:trice)` yields a cryptic error 'ArgumentError: comparison of Integer with nil failedinstead of an error as it should'. Some unused code was detected and removed.
marcandre
force-pushed
the
yield_control_hardening
branch
3 times, most recently
from
ad7ec3b
to
90aac3f
Compare
pirj
reviewed
Mar 18, 2020
pirj
approved these changes
Mar 18, 2020
marcandre
force-pushed
the
yield_control_hardening
branch
from
90aac3f
to
1341b05
Compare
pirj
reviewed
Mar 18, 2020
In particular, it would be reasonable to expect yield_control.at_least(1).at_most(4).times to work This also simplifies the failure message in case no count constraint was called.
marcandre
force-pushed
the
yield_control_hardening
branch
from
1341b05
to
04efb1f
Compare
pirj
reviewed
Mar 18, 2020
| @@ -67,6 +67,22 @@ def each_arg(*args, &block) | |||
| expect(val).to be_nil | |||
| end | |||
|
|
|||
| it 'raises an error if given an invalid count argument' do | |||
There was a problem hiding this comment.
Just for clarity, do you mind to add examples for a failure message like
expect {
expect { |b| 0.times.each(&b) }.to yield_control.at_least(:once)
}.to fail_with(/expected given block to yield control at least once but did not yield/)
expect {
expect { |b| 2.times.each(&b) }.to yield_control.at_most(:once)
}.to fail_with(/expected given block to yield control at most once but yielded twice/)
expect {
expect { |b| 1.times.each(&b) }.to yield_control.at_least(:twice)
}.to fail_with(/expected given block to yield control at least twice but yielded once/)
expect {
expect { |b| 0.times.each(&b) }.to yield_control
}.to fail_with(/expected given block to yield control but did not yield/)
|
Thanks! |
JonRowe
pushed a commit
that referenced
this pull request
May 8, 2020
Prevent invalid argument given to yield_control.exactly / at_least / at_most Previously `exactly(:trice)` would always provide a failure with message 'expected given block to yield control', even if control was yielded. `at_least(:trice)` yields a cryptic error 'ArgumentError: comparison of Integer with nil failedinstead of an error as it should'.
JonRowe
pushed a commit
that referenced
this pull request
May 8, 2020
Prevent invalid argument given to yield_control.exactly / at_least / at_most Previously `exactly(:trice)` would always provide a failure with message 'expected given block to yield control', even if control was yielded. `at_least(:trice)` yields a cryptic error 'ArgumentError: comparison of Integer with nil failedinstead of an error as it should'.
yujinakayama
pushed a commit
to yujinakayama/rspec-monorepo
that referenced
this pull request
Oct 6, 2021
Prevent invalid argument given to yield_control.exactly / at_least / at_most Previously `exactly(:trice)` would always provide a failure with message 'expected given block to yield control', even if control was yielded. `at_least(:trice)` yields a cryptic error 'ArgumentError: comparison of Integer with nil failedinstead of an error as it should'. --- This commit was imported from rspec/rspec-expectations@96bad96.
yujinakayama
pushed a commit
to yujinakayama/rspec-monorepo
that referenced
this pull request
Oct 6, 2021
This commit was imported from rspec/rspec-expectations@f3da44b.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This fixes two misuses of
yield_control.The following resulted in strange failures
Worse, the following doesn't test what is thought to be tested:
This PR fixes both.