Luis Ramos
c6cd1b7ef2
Merge pull request #3471 from luisramos0/2-0-bulk-invoices-phase2
...
[Spree Upgrade] Make Bulk Invoices part of spree upgrade phase 2
2019-02-13 12:37:15 +00:00
Maikel Linke
3b9fdfa7ac
Test tagging polymorphism on a payment method
2019-02-13 16:31:38 +11:00
Maikel Linke
9044bf60b9
Workaround Rails inheritance bug in Spree::Gateway
...
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.
https://github.com/openfoodfoundation/openfoodnetwork/issues/3121
2019-02-13 14:47:44 +11:00
luisramos0
935c8cb0ce
Move ProductImporter spec to xdescribe until all its specs are green (spree upgrade phase 2)
2019-02-12 10:38:03 +00:00
Luis Ramos
dd44d6a0ca
Merge pull request #3355 from luisramos0/2-0-pord-importer-spec
...
[Spree Upgrade] Phase 2 - Fix product_importer spec
2019-02-11 15:28:47 +00:00
Pau Pérez Fabregat
fbde4a6c97
Merge pull request #3328 from luisramos0/2-0-pi-prod-reset
...
[Spree Upgrade] Phase 2 - Product Import - Adapt product_reset_strategy
2019-02-07 15:35:44 +01:00
luisramos0
5d82efa213
Add unit test for VariantStock.can_supply?
2019-02-01 16:16:04 +00:00
luisramos0
80af7c770b
Remove rescue from products_reset_strategy in product import: if setting count_on_hand fails the import will raise a RuntimeError
2019-02-01 08:32:45 +00:00
luisramos0
4b9be6f1a8
Change product import's product_reset_strategy from depending on the inexistent variant.count_on_hand DB field and instead make individual calls to variant.count_on_hand= defined in VariantStock.
...
Also, added spec to test return value of the reset method: it should return number of updated records.
2019-02-01 08:22:50 +00:00
luisramos0
fc1004cb3a
Added now mandatory shipping_category_id to CSVs in most tests in models/product_importer_spec
2019-01-29 14:55:18 +00:00
luisramos0
729feb16f1
Merge branch 'master' into 2-0-stable-jan-29th
2019-01-29 12:38:34 +00:00
Maikel
937aaf67c3
Merge pull request #3250 from coopdevs/open-adjustments-for-update
...
[Spree Upgrade] Open adjustments to enable update
2019-01-24 10:25:16 +11:00
Kristina Lim
cf7f8b887f
Add tests for permissions for variant overrides
2019-01-24 07:08:54 +11:00
Pau Pérez Fabregat
2b95b5e797
Merge pull request #3347 from luisramos0/2-0-default-on-demand
...
[Spree Upgrade] Sets StockLocation.backorderable_default to false in test factories
2019-01-21 17:34:46 +01:00
luisramos0
d155bb142c
Make proxy order spec a bit more resilient by allowing two secs diff in timestamps
2019-01-19 15:53:05 +00:00
Pau Perez
a99a4725c9
Add #shipment to conform to OFN's decision
...
This ensures we can still use Order#shipment although Spree deprecates
it, while fixing a bug at the same time. The problem that was making the
test fail was on `Order#shipment` that Spree defines.
If the shipments association changes, `#shipment` returns stale data.
That is because the order object we might be using is still alive, and
so its @shipment ivar still holds an old shipment object (it's not nil)
and thus `@shipment ||= shipments.last` doesn't evaluate the right-hand
side of the expression.
Note that we need to `prepend` the evaluation of the concern (which it's
been rename) for our methods to take precedence over Spree ones. With
`include`, Spree's `#shipment` would still be picked up making the test
fail.
2019-01-18 16:02:51 +01:00
luisramos0
f896e78e6f
Set StockLocation.backorderable_default to false in DefaultStockLocation and in StockLocation factory.
...
This makes the default value of variant.on_demand false in all environments and in tests.
Additionally, adapt VariantStock.on_demand test and product factory to this change (setting on_hand value in product factory so it's not out of stock by default).
2019-01-17 20:28:05 +00:00
luisramos0
1d60732581
Improve readability of payment_method_spec
2019-01-17 20:18:43 +00:00
luisramos0
b52c99ac26
Delete on_hand test in product spec, this is already covered in product_stock_spec
2019-01-17 20:18:43 +00:00
Pau Perez
1e03835391
Update order while adjustments are open
...
Spree supports updating line items as the model contains these two
callbacks:
f55722b38d/core/app/models/spree/line_item.rb (L27-L28)f55722b38d/core/app/models/spree/adjustment.rb (L1-L7)f55722b38d/core/app/models/spree/adjustment.rb (L84-L92)
2019-01-16 15:28:54 +01:00
Pau Pérez Fabregat
b05b2c3a5a
Merge pull request #3254 from coopdevs/add-default-stock-location
...
[Spree Upgrade] Create the default StockLocation in DB
2019-01-16 12:57:45 +01:00
Pau Perez
5b8c0dffe2
Remove test for a state that is no longer possible
2019-01-11 16:39:06 +01:00
luisramos0
9ab99f13c4
Merge branch 'master' into 2-0-stable-jan-11th
2019-01-11 11:58:24 +00:00
Maikel
4920782742
Merge pull request #3072 from luisramos0/2-0-calc-line-items-for-take-2
...
Fix bug on calculator_decorator line_items_for where input is line_item with a nil order
2019-01-11 14:49:25 +11:00
Maikel
6c3d769121
Merge pull request #3229 from mkllnk/3127-tax-rates-report
...
3127 More robust tax rates report
2019-01-11 10:41:12 +11:00
luisramos0
2cc8a0e9e3
Fix models/variant_override_spec by setting mandatory on_demand true when count_on_hand is nil
2019-01-08 15:32:10 +00:00
luisramos0
e28f9a7c84
Merge branch 'master' into 2-0-stable-jan-8th
2019-01-08 14:29:50 +00:00
luisramos0
4f79fd5be0
Improve availability validator spec readability and remove unnecessary expect statements
2018-12-21 11:19:12 +00:00
luisramos0
c1aeb2e9a3
Improve naming in availability_validator_decorator and cover it with tests
2018-12-20 14:26:34 +00:00
luisramos0
3085e15961
Fix order factory by making line_item.skip_stock_check work in spree 2
2018-12-20 14:26:34 +00:00
Maikel Linke
a341561446
Move tax rate finding into service and spec it
...
The `#tax_rates` method is actually not present in Spree. We encapsulate
the logic in this commit and enable better unit testing. The new tests
cover a current bug: https://github.com/openfoodfoundation/openfoodnetwork/issues/3127
2018-12-19 14:31:29 +11:00
luisramos0
66e69edca4
Rename ProductOnDemand to ProductStock; move product.on_hand into it; add product.on_demand; and remove unnecessary on_demand=
2018-12-12 12:10:25 +00:00
Pau Pérez Fabregat
7834fa4d00
Merge pull request #3190 from luisramos0/2-0-new-product
...
[Spree Upgrade] Fix "new product" page specs and an html issue
2018-12-11 08:35:26 +01:00
Maikel
d63ae792b3
Merge pull request #2775 from luisramos0/2-0-checkout-ship-method
...
[Spree Upgrade] Handle shipping_method_id in checkout
2018-12-11 11:59:03 +11:00
luisramos0
4f4fc00549
Improve code, specs and comments in the shipping_method selection process in the checkout controller
2018-12-09 20:05:10 +00:00
luisramos0
38ff99717a
Fix bug on calculator_decorator line_items_for where input is line_item with an nil order. Adapted line_items_for so that weight_calculator.line_items_for could be removed.
2018-12-09 19:37:11 +00:00
Kristina Lim
34313c94ca
Make reset stock settings for VO force limited stock
2018-12-09 21:47:05 +08:00
luisramos0
7ecce51b8b
Create default stock location and set required product.shipping_category in specs that create products
2018-12-08 14:52:50 +00:00
Kristina Lim
83b6973bc2
Require compatible VO on_demand and count_on_hand
2018-12-07 14:39:36 +08:00
Maikel
a2c8bea147
Merge pull request #3147 from luisramos0/2-0-vos
...
[Spree Upgrade] Adapt variant overrides to spree 2
2018-12-05 10:50:20 +11:00
luisramos0
e23c4dda68
Add order_shipping_method specs to cover select_shipping_method
2018-11-30 12:58:27 +00:00
luisramos0
d962358f15
Fix rubocop and transpec models/variant_override and its spec
2018-11-30 00:43:55 +00:00
luisramos0
0577011f5b
Refactor variant override model and its spec: simplify move_stock and remove unused methods
2018-11-30 00:22:04 +00:00
Pau Perez
7834b1d3f3
Fix test case for invalid product master
2018-11-28 17:39:59 +01:00
luisramos0
d28f47046a
Fix product model spec by removing unnecessary on_hand setter and adding required fields for a new product
2018-11-22 20:38:58 +00:00
Maikel
6835d24fbf
Merge pull request #3004 from luisramos0/2-0-mail-method-fix
...
[Spree Upgrade] Fix line Item specs with problems related to VariantStock.on_hand=
2018-11-20 16:37:19 +11:00
luisramos0
bf32a21155
Allow adapted on_hand attr to be mass assigned in VariantStock.
...
Without specifying it in `attr_accessible`, `#assign_attributes` won't
work. See details in
https://apidock.com/rails/v3.2.13/ActiveRecord/Persistence/update_attributes
and https://apidock.com/rails/ActiveRecord/Base/assign_attributes .
2018-11-19 10:05:17 +00:00
luisramos0
ee8d77bc09
Fix order spec restart checkout test by adding a required line_item to the order being tested
2018-11-17 11:57:16 +00:00
Maikel
5d200b7753
Merge pull request #3026 from luisramos0/2-0-calculator-line-items-for
...
[Spree Upgrade] Improve failed_checkout_spec by making calculator decorator line_items_for work with new Stock::Package
2018-11-16 10:41:29 +11:00
luisramos0
688ec5fb21
Fix rubocop issues in calculator_decorator and calculator/flat_percent_item_total_spec
2018-11-14 23:04:38 +00:00
