Merge 2-0-stable to master #3742
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
Fix orders controller spec
Due to a bug in ActiveRecord we need to load the tagging code in Gateway which should have inherited it from its parent PaymentMethod. We have to call it before loading the PaymentMethod decorator because the tagging code won't load twice within the inheritance chain. #3121
…e (will be fixed as part of spree upgrade phase 2)
[Spree Upgrade] Adapt api shipments controller to OFN by scoping variants before each action
This fixes the following error
```
1) Spree::Admin::InvoicesController#poll when the file is available returns true
Failure/Error: spree_get :poll, invoice_id: invoice_id
#<File (class)> received :exist? with unexpected arguments
expected: ("tmp/invoices/479186263.pdf")
got: ("/home/pau/dev/openfoodnetwork/tmp/cache/paralleltests/3B7/CD1/spree%2Fapp_configuration%2Fredirect_https_to_http")
Please stub a default value first if message might be received with other args as well.
# ./spec/controllers/spree/admin/invoices_controller_spec.rb:28:in `block (4 levels) in <top (required)>'
# -e:1:in `<main>'
```
`paralleltests` also relies on `File.exist?` and so stubbing it breaks
it unless we purposefully allow other calls.
[Spree upgrade] Workaround Rails inheritance bug in Spree::Gateway
[Spree Upgrade] Make Bulk Invoices part of spree upgrade phase 2
Stub default value for other calls to File.exist?
[Spree Upgrade] Merging master into 2-0-stable (2nd run in Feb2019)
* 2-0-stable: (121 commits) Stub default value for other calls to File.exist? Add specs for error cases in shipments_controller_spec Move features/admin/reports/enterprise_fee_summaries_spec to xdescribe (will be fixed as part of spree upgrade phase 2) Add missing translation to fix shipping methods spec Test tagging polymorphism on a payment method Workaround Rails inheritance bug in Spree::Gateway Improve method names in shipments_controller_spec Move ProductImporter spec to xdescribe until all its specs are green (spree upgrade phase 2) Make bulk invoices part of spree upgrade phase 2 Make Api::ShipmentsController#create re-use order.shipment if it exists Improve code and add specs to this controller Decorate spree api shipments controller to scope variants as they are added/removed from shipments Delete all Spree::Admin::LineItemsController customizations as they are no longer used Update spec/controllers/spree/orders_controller_spec.rb Fix broken spec from refactored method Wait for button to disappear before checking flash Use flash matcher in shipping method feature specs Add RSpec matchers for flash messages Do not expect modal open when checking spinner gone Fix layout violation in Spree::Ability decorator Fix description for feature flag example groups ...
Otherwise checking `ActionMailer::Base.deliveries.count` won't see any.
Perform delivery when checking deliveries in specs
* 2-0-stable: Perform delivery when checking deliveries in specs
[Spree Upgrade] Fix order_with_totals_and_distribution factory by updating shipping fees
…rder, this makes the order worflow work up to complete because the shipping methods will be validated against the address
[Spree Upgrade] Fix bulk_order_mgmt_spec - 2-0 build GREEN !!!
…ct.has_stock? already includes product.on_demand and in v2 allow_backorders becomes on_demand
variant.on_hand will not return infinity any longer if variant.on_demand is true. Clients of these methods will have to handle the combinations between on_hand and on_demand values
…ed on the server side, the UI can make the decision to show on_demand on the on_hand column if on_demand is true
Spree changed their way of soft-deleting products, variants and some other models. `#destroy` is now soft-deleting and replaces `#delete`. This commit considers only products. Variants will follow in another commit. The other models can be ignored, because we don't call `delete` on them.
Spree changed the controller to deal with the updated soft-delete. This commit brings these changes to our decorator.
2520 Remove `process_payments!` override
…letion Add specs for the cache refresh on variant removal
This still achieves a logic issue before the Spree upgrade, where switching from pick-up to delivery affects whether simultaneous changes to shipping address are ignored or not. This behaviour can be fixed in a separate PR.
The way that the bill contact details and distributor address are set for pickup orders has changed. At this point, after before_save_hook is called, the bill contact details have already been set as well.
This method has become only a small part of the logic for updating the order's ship address. This no longer follows the method naming convention within OrderSyncer where update_*_for describes almost the complete logic for updating the association. This is renamed in preparation for extraction of the complete update logic for ship_address. The new method will be named update_ship_address_for.
[Spree Upgrade] Merging master into 2-0-stable (1st run in Apr2019)
[Spree Upgrade] LAST merge master into 2-0-stable 🎉
Removing a variant from OC will prevent user with that variant in the cart from checking out
[Spree Upgrade] Fix bug in Variant Overrides controller
[Spree Upgrade] Migrate spree_variants.on_demand to spree_stock_items.backorderable
|
v1.31.0 is prepared this PR can be merged now! ready for review :-D |
…mfile.lock compatile with ofn/spree 2-0-4 gemspec
[Spree Upgrade] Update to spree revision that depends on aws-sdk 1.11.1
2788 [Subscriptions] Fix address issues when syncing subscriptions and orders
|
|
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.
Are we merging 2-0-stable with a PR like this?
Or do we force push 2-0-stable into master?
@sauloperez @mkllnk @Matt-Yorkley @kristinalim