Call empty only on incomplete orders #5827
Merged
+34
−34
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
nvandoorn
changed the title
github-actions
bot
added
changelog:solidus_api
|
Looks like we have a few spec failures that we're currently addressing. |
tvdeyen
reviewed
Sep 12, 2024
| end | ||
|
|
||
| expect(page.current_path).to eq(spree.cart_admin_order_path(order)) | ||
| expect(page).not_to have_content(order.line_items.first.variant.sku) |
There was a problem hiding this comment.
This can lead to false positives. Can we expect an empty order message instead?
Suggested change
| expect(page).not_to have_content(order.line_items.first.variant.sku) | |
| expect(page).to have_content I18n.t('spree.your_order_is_empty_add_product') |
There was a problem hiding this comment.
Thanks @tvdeyen. I ended up re-writting most of this spec in the latest revision, so let me know what you think :)
nvandoorn
force-pushed
the
call-empty-only-on-incomplete-orders
branch
from
967b064
to
e96f358
Compare
Code fails with a 500 on admin because of the order shipping status. The change triggers @order.empty! only when the order is incomplete. Co-authored-by: An Stewart <[email protected]> Co-authored-by: Kendra Chateau <[email protected]>
nvandoorn
force-pushed
the
call-empty-only-on-incomplete-orders
branch
from
e96f358
to
c4fd1df
Compare
jarednorman
approved these changes
Sep 17, 2024
MadelineCollier
approved these changes
Sep 18, 2024
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.
Summary
Fixes #4438. This change is based on #5418 from @nirnaeth.
There are two notable changes from #5418:
Checklist
Check out our PR guidelines for more details.
The following are mandatory for all PRs:
The following are not always needed: