raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,751 Commits 18 Branches 452 Tags
e486a94fb4e121a030d725a6b6cc5a7bed204ba7
Commit Graph

4944 Commits

Author SHA1 Message Date
luisramos0
e4c54a4954 Add order distributor to shipping method in reports_spec 2019-04-09 23:26:14 +01:00
Luis Ramos
4478d51aee Merge pull request #3668 from luisramos0/2-0-stable-Mar29 
[Spree Upgrade] Merging master into 2-0-stable (4th run in Mar2019)
 2019-04-09 17:46:36 +01:00
Luis Ramos
ef2e00ae31 Merge pull request #3604 from luisramos0/2-0-fix-splitters 
[Spree Upgrade] Override default spree splitters config
 2019-04-09 09:19:00 +01:00
luisramos0
e9491cecab Fix flaky spec by having only one variant with display name small bag 2019-04-06 10:14:19 +01:00
luisramos0
258a9efa0d Adapt product_importer_spec to ofn v2 where there’s no product.count_on_hand and on_hand does not default to infinity if product.on_demand 2019-04-05 22:09:46 +01:00
luisramos0
bb4cec1186 Fix order_and_distributor_report_spec by setting ofn shipping method the ofn v2 way 2019-04-05 22:06:44 +01:00
luisramos0
ecc60f3b61 Merge branch 'master' into 2-0-stable-Mar29 2019-04-05 15:47:46 +01:00
Pau Pérez Fabregat
0c75a070c6 Merge pull request #3650 from kristinalim/fix/2786-address_subscription_confirm_job_failing_specs 
3487,2786 [Spree Upgrade] Address spec failures for SubscriptionConfirmJob
 2019-04-05 15:45:41 +02:00
Pau Perez
3e7e24d700 Make VariantController specs aware of destroy call 
In v2 we no longer rely on `Variant#delete` but `Variant#destroy` so
stubbed calls needed fixing.
 2019-04-05 15:38:10 +02:00
Pau Pérez Fabregat
c515a8f115 Merge pull request #3537 from Matt-Yorkley/pi/on_demand_error 
Fix nil values in on_hand column
 2019-04-03 11:56:06 +02:00
Pau Pérez Fabregat
b288cb00c1 Merge pull request #3654 from mkllnk/3237-spec-overrides-in-inventory-report 
Test inventory report to use variant overrides
 2019-04-03 11:55:33 +02:00
Luis Ramos
d48d2a748b Merge pull request #3662 from SDBowen/add_shipping_method 
Add shipping method name to orders detail report
 2019-04-01 15:37:57 +01:00
Kristina Lim
d866fad46e Persist variants in customer totals specs 
This is to properly record the on hand quantity.
 2019-03-31 18:32:09 +08:00
luisramos0
bc8bca074c Switch object in the ability to access reports. This adapts to this change in Spree: 3685569db4 
Adapt NavigationHelper to return the controller object for reports so that Reports tab works correctly.
 2019-03-29 22:16:39 +00:00
luisramos0
1fc4b7fd2a Add manual shipping adjustment 
For some reason this adjustment is not being added to order through the callbacks as it was before. See PR #3371
 2019-03-29 22:16:39 +00:00
luisramos0
d713c755e6 Uncomment report specs so we can make them work in v2 2019-03-29 22:16:38 +00:00
luisramos0
527cfc1601 Merge branch 'master' into 2-0-stable-Mar29 2019-03-29 13:48:49 +00:00
Maikel
7348987567 Merge pull request #3315 from luisramos0/2-0-phase2-pi 
[Spree Upgrade] Phase 2 - Product Import ready - all specs running and green
 2019-03-29 15:16:35 +11:00
Maikel
6e31f0078a Merge pull request #3639 from coopdevs/fix-variant-cache-refreshing-on-delete 
Fix variant cache refreshing on delete
 2019-03-29 15:12:46 +11:00
sdbowen
0f7ef2671f Add shipping method name to orders detail report 
Added column allows users to see the shipping method of each order.
 2019-03-28 16:08:10 -06:00
Kristina Lim
f0746eb643 Use :performing_deliveries in spec 2019-03-28 02:04:13 +08:00
luisramos0
b780823970 Fix specs to adapt to the fact that for the order workflow to get to delivery, the shipping method must be linked to the order distributor otherwise it's ignored when creating the order shipment 2019-03-27 14:10:51 +00:00
Maikel Linke
ef882b8293 Wait for entered tag before submitting 
The changed spec was failing from time to time. This change seems to
make it stable. It may be worth moving tag entering into a helper that
verifies that the tag was entered (waits for it).
 2019-03-27 10:58:00 +11:00
luisramos0
ae66e864a5 Improve models/spree/order/checkout_spec: AR is here to help you :-D 2019-03-26 15:37:36 +00:00
luisramos0
428656e92e Add distributor to shipping method in factory completed_order_with_fees so that shipping method is not discarded during order processing in package.shipping_methods 2019-03-26 15:37:36 +00:00
luisramos0
beb19cdc8a Override default spree splitters config (was Shipping Category and Backordered) to use only Base splitter, this splitter does not split the orders into multiple shipments 
In OFN we cannot split the orders because one order can only have one shipment

Additionally, add spec to validate that the order workflow now works with products with different shipping categories
 2019-03-26 15:37:35 +00:00
Pau Pérez Fabregat
a8f81ae7a2 Merge pull request #3652 from kristinalim/fix/3410-address_proxy_orders_controller_failing_specs 
3410 [Spree Upgrade] Address spec failures for Admin::ProxyOrdersController
 2019-03-26 15:55:13 +01:00
luisramos0
5ce762a600 Uncomment product import specs so we can make them work in v2 2019-03-26 11:34:04 +00:00
Maikel Linke
9d4589632b Test inventory report to use variant overrides 2019-03-26 16:13:50 +11:00
Kristina Lim
db6dab2e54 Address failing specs for ProxyOrdersController 2019-03-26 00:56:02 +08:00
Kristina Lim
2aad5baac5 Make code style changes for SubscriptionConfirmJob specs 2019-03-25 22:22:11 +08:00
Kristina Lim
18fe35e130 Address spec failures for SubscriptionConfirmJob 2019-03-25 21:55:38 +08:00
Kristina Lim
79d0b63069 Add Spree::Address#full_name_reverse 2019-03-25 07:46:31 +08:00
Kristina Lim
46e7090d11 Group report by variant and use variant SKU 
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.
 2019-03-25 07:45:32 +08:00
Maikel Linke
7bc735eea3 Cover report content with specs 2019-03-25 04:47:13 +08:00
Maikel Linke
fdd8c06823 Style reports spec 2019-03-25 04:47:13 +08:00
Maikel Linke
856603cadd Convert specs to RSpec 3.8.0 syntax with Transpec 
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
 2019-03-25 04:47:13 +08:00
Maikel Linke
0a243ac9ca Give spec vars proper names 2019-03-25 04:47:12 +08:00
Maikel Linke
6ee27cd166 Fix spec to test the right report 
Probably a copy&paste error. The PackingReport had exactly the same
spec.
 2019-03-25 04:47:12 +08:00
Maikel Linke
dac4d4ff1a DRY report spec 2019-03-25 04:47:07 +08:00
luisramos0
01f82e5214 Move OrderSyncer spec to xdescribe until it is fixed as part of spree upgrade phase 2. This is a subscriptions specific spec 2019-03-22 13:06:45 +00:00
luisramos0
287ea6038a Remove distributors from product in completed_order_with_fees factory. This setter is no longer available after product distributions has been deleted 2019-03-22 11:50:24 +00:00
luisramos0
c1d14686a6 Merge branch 'master' into 2-0-stable-Mar22 2019-03-22 10:55:17 +00:00
Luis Ramos
6cd07cd107 Merge pull request #3605 from kristinalim/fix/2788-improve_specs_for_order_syncer 
[Subscriptions] (v1) Fix assertions in specs for OrderSyncer
 2019-03-22 10:31:01 +00:00
Pau Pérez Fabregat
846e6fdd90 Merge pull request #3560 from kristinalim/fix/2788-shipping_method_id_in_shipments 
2696,2788 [Spree Upgrade] Fix use of shipping method ID for subscriptions
 2019-03-22 11:08:23 +01:00
Pau Pérez Fabregat
4595ea033f Merge pull request #3624 from mkllnk/2873-spec-register-link 
Add spec for registration link on Spree pages
 2019-03-22 10:47:43 +01:00
Pau Pérez Fabregat
87f0ddabe7 Merge pull request #3548 from luisramos0/2-0-remove-unused-new-v2-features 
[Spree Upgrade] Remove unused spree v2 features
 2019-03-22 10:35:15 +01:00
Pau Perez
96b8c8ac2c Refresh products cache also on Variant#delete 
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.
 2019-03-22 09:57:15 +01:00
Pau Perez
b293e00777 Test that we refresh the cache on variant destroy 
These tests prove that
https://github.com/openfoodfoundation/openfoodnetwork/issues/3629 is
indeed is a bug because we don't refresh the cache when deleting
a variant.
 2019-03-22 09:38:24 +01:00
Pau Perez
fbc3fc6a51 Test spree/admin/variants_controller #destroy 2019-03-22 09:18:31 +01:00