[Spree Upgrade] Fix checkout feature specs #3100
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
luisramos0
suggested changes
Nov 21, 2018
| @@ -28,7 +28,7 @@ def edit | |||
| associate_user | |||
|
|
|||
| if @order.insufficient_stock_lines.present? | |||
| flash[:error] = t(:spree_inventory_error_flash_for_insufficient_quantity) | |||
| flash[:error] = Spree.t(:inventory_error_flash_for_insufficient_quantity) | |||
There was a problem hiding this comment.
see #3095
you can keep t(:spree_inventory_error_flash_for_insufficient_quantity) and move the translation to our en.yml under spree:
sauloperez
approved these changes
Nov 21, 2018
HugsDaniel
force-pushed
the
2999-checkout-feature-specs
branch
from
d6e3be1 to
42d2599
Compare
luisramos0
approved these changes
Nov 22, 2018
|
just a conflict to be resolved and ready to go! |
|
@HugsDaniel I was expecting a rebase here. |
HugsDaniel
force-pushed
the
2999-checkout-feature-specs
branch
from
20400d7 to
d7a148b
Compare
Sorry for my late response. Sure it will. |
|
meanwhile @HugsDaniel has rebased and Ive merged the rebased version. |
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.
What? Why?
Part of #2999
This fix three of the five remaining failing specs in
spec/features/consumer/shopping/checkout_spec.rb.What should we test?
Only two specs fail in
spec/features/consumer/shopping/checkout_spec.rb, related to tax calculations.How is this related to the Spree upgrade?
This is part of fixing the Spree 2 build.