[Spree Upgrade] Merging master into 2-0-stable (4th run in Mar2019) #3668
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
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 4.9.0 to 4.10.0. - [Release notes](https://github.com/stripe/stripe-ruby/releases) - [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md) - [Commits](stripe/stripe-ruby@v4.9.0...v4.10.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
Bumps [oj](https://github.com/ohler55/oj) from 3.7.10 to 3.7.11. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](ohler55/oj@v3.7.10...v3.7.11) Signed-off-by: dependabot[bot] <support@dependabot.com>
These tests prove that openfoodfoundation#3629 is indeed is a bug because we don't refresh the cache when deleting a variant.
Note that, as explained in https://apidock.com/rails/v3.2.13/ActiveRecord/Relation/delete, `delete` does not trigger callbacks and so it skips the products cache logic. If we still want to avoid instantiating the AR object, we need to explicitly call that logic for the cache to be up-to-date.
Probably a copy&paste error. The PackingReport had exactly the same spec.
This conversion is done by Transpec 3.4.0 with the following command:
transpec spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb
* 8 conversions
from: == expected
to: eq(expected)
* 8 conversions
from: obj.should
to: expect(obj).to
* 1 conversion
from: obj.stub(:message)
to: allow(obj).to receive(:message)
For more details: https://github.com/yujinakayama/transpec#supported-conversions
This groups the Customer Totals report by variant too (among others, including by product), and then changes the report to use the variant SKU not the product SKU. This adds a spec for customer totals grouping and details, which replaces the test specific to the SKU column.
Line items belong to a single order.
…product_sku_in_report 3528 Scope Customer Totals report also by variant (not just product) and use variant SKU
|
thank you very much @kristinalim 🙏 |
…method Add shipping method name to orders detail report
I saw the following error on the 2-0-stable branch: translation missing: en.spree.line_item_adjustments In a pending PR I change all three translations in the view file to use lazy lookup. This commit backports the addition to the locale so that it can be translated via Transifex before we release v2.
…rides-in-inventory-report Test inventory report to use variant overrides
…mand_error Fix nil values in on_hand column
Relax stripe version requirement
…2-translation Add missing translation for order form in v2
Fix outdated db2fog initializer
In v2 we no longer rely on `Variant#delete` but `Variant#destroy` so stubbed calls needed fixing.
|
Fixed! Sorry for my late notice and thanks for the offering @kristinalim |
|
ah, awesome, thanks a lot team!!! |
…on_hand and on_hand does not default to infinity if product.on_demand
|
This was one week old already so I run another git merge master into this branch. |
sauloperez
approved these changes
Apr 8, 2019
kristinalim
approved these changes
Apr 9, 2019
|
yeah, I have added 3 more PRs that are brought to v2 with this. |
|
apologies for bypassing the process, I decided to merge this now so we can test everything together (#3604 for example) now. |
This was referenced Apr 10, 2019
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.
Merging master into 2-0-stable.
Same as previous #3640
This is the result of:
git checkout master
git pull upstream master
git checkout 2-0-stable
git pull upstream 2-0-stable git checkout -b 2-0-stable-Mar29
git merge master
####Conflicts:
CONFLICT (content): Merge conflict in spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb
keep master and replace factory line_item with line_item_with_shipment in a few places
git add spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb
I am having trouble with the new specs from #3646, @kristinalim @mkllnk could you please have a look?
CONFLICT (content): Merge conflict in app/controllers/spree/admin/variants_controller_decorator.rb
keep HEAD
git add app/controllers/spree/admin/variants_controller_decorator.rb
remove delete_and_refresh_cache from variant_decorator
git add app/models/spree/variant_decorator.rb
remove delete_and_refresh_cache tests from variant spec
git add spec/models/spree/variant_spec.rb
thanks @sauloperez for directions here, it made the merge very easy. I thought it was working but the build is broken here as well in app/models/spree/variant_decorator.rb @sauloperez could you please have a look?
CONFLICT (content): Merge conflict in Gemfile.lock
keep 2-0 but update stripe to 4.11
git add Gemfile.lock
CONFLICT (content): Merge conflict in Gemfile
keep 2-0 but update stripe to 4.11
git add Gemfile
git commit
git push origin 2-0-stable-Mar29
What should we test?
On Zenhub, this PR is connected with and blocks #3625.
According to PR #3647, #3625 needs to be solved already in this merge PR.
there are also these PRs that are now brought to v2 (I am not sure we need to retest): #3662, #3646 and #3644