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
Pau Pérez Fabregat
faea876ff0
Merge pull request #3361 from luisramos0/2-0-report-spec
...
[Spree Upgrade] Phase 2 - Fix some specs in reports_spec and in lettuce share report
2019-02-01 08:26:55 +01:00
Kristina Lim
65438e2619
Refactor checking no preview image in specs
2019-01-31 05:04:18 +08:00
Kristina Lim
a3c808a172
Refactor checking of preview image path in specs
2019-01-31 05:02:57 +08:00
Kristina Lim
777712a0e9
Fix race condition in enterprise image feature specs
2019-01-31 04:52:40 +08:00
luisramos0
f6e6f67e7d
Switch Spree::Config test setup with a mock in reports_spec to keep global test setup untouched
2019-01-30 15:03:23 +00:00
Maikel
155b205ac2
Merge pull request #3401 from luisramos0/2-0-stable-jan-29th
...
[Spree Upgrade] Merging master into 2-0-stable (4th run in Jan2019)
2019-01-30 14:44:40 +11:00
Maikel
bef7684505
Merge pull request #3399 from kristinalim/fix/3381-address_failing_tests
...
3381 [Flaky Spec] Load enterprise users tab before inspecting table
2019-01-30 14:29:16 +11:00
luisramos0
dce2524353
Added now mandatory shipping_category_id to CSVs in tests in admin/product_import_spec
2019-01-29 14:55:19 +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
Pau Perez
f4b790eefa
Restore adjustments state after updating
...
We don't know exactly if all adjustments are closed in all
circumstances, so it's better to be conservative until we figure out.
Chances are that non-completed orders have them open.
2019-01-29 09:40:54 +01:00
Pau Perez
c9429760cd
Trigger the appropriate callbacks from controller
2019-01-29 09:40:54 +01:00
Pau Perez
0b62b4621f
Make expectation easier to reason about
2019-01-29 09:40:54 +01:00
Pau Perez
9d1d8513e7
Make controller req. params a bit more obvious
2019-01-29 09:40:54 +01:00
Pau Perez
f589d4125d
Restore distributor in test that relies on it
2019-01-29 09:40:54 +01:00
Pau Perez
1bceb0748a
Do not modify config's state in test
2019-01-29 09:40:53 +01:00
luisramos0
8a86c0473d
Change app config to keep using the same v1 shipping method calculators and not the ones spree v2 introduces, these are copy pasted versions that work with packages
...
See this commit for more details: 18e5b98f5c (diff-b0846898827183f530c113ad7b83b8ea)
2019-01-27 21:03:32 +00:00
Kristina Lim
2129ab991b
Load enterprise users tab before inspecting table
2019-01-26 12:11:41 +08:00
luisramos0
bd24d3e27a
Remove setting the now inexistent global config allow_backorders to false in subs specs because the default value for on_demand (set through stocklocation.backorderabl_default) is false in all specs
2019-01-25 22:12:13 +00:00
Kristina Lim
c33808e8f5
Extract some actions in tests into methods
2019-01-26 02:03:56 +08:00
Kristina Lim
da4d6a092a
Add spec helper for choosing today from datepicker
2019-01-26 02:03:56 +08:00
Kristina Lim
b691d727a7
Move OFN::SubscriptionService to SubscriptionVariantsService
2019-01-26 02:03:55 +08:00
Kristina Lim
c23002102c
Add warning for unavailable subscription items
2019-01-26 02:03:55 +08:00
Kristina Lim
929290fc77
Reduce restrictions for creating subscriptions
...
Allow the following variants:
* Variants of permitted producers
* Variants of hub
* Variants that are in outgoing exchanges where the hub is receiver
2019-01-26 02:03:54 +08:00
Kristina Lim
57f6a7a3b9
Support clicking different text for select2 helper
...
Interaction with the variant autocomplete is not precise. The specs only
search for the product name, then click the first result that matches
the product name which they see.
This could have been the case because searching using the full variant
name does not match the variant. For example, searching "Some Product -
1kg" would not have results, while searching only "Some Product" (the
product name) would list "Some Product - 1kg".
Clicking the first match does not work in all scenarios.
This allows using a separate text for searching and for clicking.
2019-01-26 02:03:54 +08:00
Kristina Lim
d3f20289f8
Move setup of feature specs for creating subscriptions
2019-01-26 02:03:53 +08:00
Kristina Lim
35c0bcb3df
Add tests for eligible variants for a subscription
2019-01-26 02:03:53 +08:00
Kristina Lim
28c70c7719
Fix nesting of specs for editing subscriptions
2019-01-26 02:03:53 +08:00
Kristina Lim
b9492d6483
Fix setup in tests for SubscriptionValidator
2019-01-26 02:03:49 +08:00
Kristina Lim
4425b0416d
Rename import_data feature test method
2019-01-25 04:42:11 +08:00
Kristina Lim
b0efc3a2fa
Add feature spec for large file import
2019-01-25 04:42:06 +08: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
luisramos0
908c32587b
Fix xero invoices specs in reports_spec by removing the shipping adjustment as this is put in the order by the standard order callbacks when line items are added
2019-01-23 15:07:31 +00:00
Maikel
2064ffe548
Merge pull request #3354 from luisramos0/knapsack
...
New Knapsack report
2019-01-22 10:58:13 +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
0f26080d79
In lettuce share report spec, call method directly instead of using send
2019-01-21 15:00:37 +00:00
Pau Pérez Fabregat
d8710d283a
Merge pull request #3320 from luisramos0/2-0-subs-mailer
...
[Spree Upgrade] Phase 2 - Subscriptions - Specify :mailer type in SubscriptionMailer spec
2019-01-21 15:09:56 +01:00
Pau Pérez Fabregat
807c45a25c
Merge pull request #3349 from coopdevs/fix-shipment-without-fee
...
Fix shipment without fee
2019-01-21 14:51:10 +01:00
luisramos0
9b2fb56025
Fix reports_spec sales tax report test by calling count_on_hand setter, setting shipping_method in the right step in the checkout workflow and changing login method to match all other tests in this spec
2019-01-20 20:40:14 +00:00
luisramos0
4669c71b19
Fix lettuce_share_report_spec by adapting count_on_hand setter, it's not a db column anymore
2019-01-20 20:40:14 +00:00
luisramos0
5d86d3769e
Improve variable names in lettuce_share_report_spec
2019-01-20 20:40:14 +00: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
Matt-Yorkley
3929689d48
Ensure login via modal is completed
2019-01-18 19:06:42 +00:00
Pau Pérez Fabregat
a95dd98ed6
Merge pull request #2869 from Matt-Yorkley/bi/bulk_invoices
...
[Bulk Invoice Printing] Bulk invoices
2019-01-18 17:49:34 +01: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
01f0671f6d
Add missing accept alert in products_spec when deleting product properties
2019-01-18 12:45:29 +00:00
luisramos0
6da94fc960
Adapt cart_controller_spec to new variant_stock where variant count_on_hand can only be set after saving the variant
2019-01-18 12:45:29 +00:00
luisramos0
eac365182f
Adapt variants_stock_levels_spec to new variant_stock where variant count_on_hand can only be set after saving the variant
2019-01-18 12:45:25 +00:00
