Fix tests after two conflicting merges #4249
Merged
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
PR solidusio#4243 (19800b7) changed the `"in the prices"` RSpec's context of the `backend/spec/features/admin/products/pricing_spec.rb` to visit the prices page in a `subject` instead of a `before` block. The reason is that the former needs to be called explicitly, and we wanted it to be called after the pagination was stubbed in a new test (see https://github.com/tvdeyen/solidus/blob/12864a8aa578339173428cf4e1cd8f3f65bbc418/backend/spec/features/admin/products/pricing_spec.rb#L85-L89). All the other tests within that context were updated accordingly to call `subject` manually. On the other side, solidusio#4244 (218229d) added new tests within the same RSpec's context, still using the version with `before`. Once both commits have been merged, we need to update the new tests from solidusio#4244 to call `subject`.
spaghetticode
approved these changes
Jan 25, 2022
kennyadsl
approved these changes
Jan 25, 2022
There was a problem hiding this comment.
My fault at merging without asking for a rebase. Thanks @waiting-for-dev!
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.
PR #4243 (19800b7) changed the
"in the prices"RSpec's context of thebackend/spec/features/admin/products/pricing_spec.rbto visit theprices page in a
subjectinstead of abeforeblock. The reason isthat the former needs to be called explicitly, and we wanted it to be
called after the pagination was stubbed in a new test (see
https://github.com/tvdeyen/solidus/blob/12864a8aa578339173428cf4e1cd8f3f65bbc418/backend/spec/features/admin/products/pricing_spec.rb#L85-L89).
All the other tests within that context were updated accordingly to call
subjectmanually.On the other side, #4244 (218229d)
added new tests within the same RSpec's context, still using the version
with
before.Once both commits have been merged, we need to update the new tests from #4244 to call
subject.