Pau Pérez Fabregat
380a9c561e
Merge pull request #3725 from coopdevs/add-specs-for-cache-variant-deletion
...
Add specs for the cache refresh on variant removal
2019-04-19 19:02:04 +02:00
Maikel
99a4878bdf
Merge pull request #3653 from mkllnk/2520-spree2-order-subscription
...
2520 Remove `process_payments!` override
2019-04-19 07:34:30 +10:00
luisramos0
a68b5eaf22
Fix bug in Variant Overrides controller. It was validating authorization for variant overrides of deleted variants
2019-04-17 15:31:19 +01:00
luisramos0
3d420d5727
Merge branch 'master' into 2-0-stable-Apr15
2019-04-16 21:14:11 +01:00
Luis Ramos
67a7e26757
Merge pull request #3695 from luisramos0/2-0-emails-transl
...
[Spree Upgrade] Fix translation missing in order confirmation email subject and bring cancel email to ofn
2019-04-16 13:44:24 +01:00
Luis Ramos
29000ebe0d
Merge pull request #3651 from luisramos0/2-0-enterprise-fee-report
...
[Spree Upgrade] Fix Enterprise fee report specs
2019-04-16 12:36:53 +01:00
Maikel Linke
278190a25c
Update specs for Spree v2 payment requirement
...
This pull request removed the override of `process_payments!` which was based on v1. Spree v2 has an additional check: An order in payment state requires a payment. Some specs didn't care and didn't create payments before transitioning to `complete`.
2019-04-16 10:30:14 +10:00
Maikel Linke
6f12eee8ae
Reduce the override of Order for subscriptions
...
Orders belonging to subscriptions get completed without payment. That
requires overriding Spree's functionality.
In Spree 2, an order in payment state without pending orders is invalid.
Instead we skip the payment state by not requiring a payment for
automatically generated orders until the order cycle is closed.
2019-04-16 10:30:14 +10:00
luisramos0
e8ccb55f47
Use rspec 3 syntax in order_cycle_distributed_variants_spec and checkout_controller_spec
2019-04-15 12:39:52 +01:00
luisramos0
fce3d69345
Add flash and warning to the cart page when item becomes unavailable
2019-04-13 21:39:41 +01:00
luisramos0
d602375ac7
Redirect user to cart page if some item in the order is unavailable
2019-04-13 20:31:05 +01:00
luisramos0
59ec52babe
Refactor order_cycle_distributed_variants, better method names and simpler code
2019-04-11 22:15:24 +01:00
luisramos0
44b0592223
Move OrdercycleDistributedVariants from lib/open_food_network to app/services
2019-04-11 21:37:08 +01:00
luisramos0
96ee527f0c
Rename distribution_change_validator to order_cycle_distributed_variants
2019-04-11 21:14:01 +01:00
luisramos0
46278e3edd
Set distributor in order and shipping methods so that refreshing shipment rates suceeds
2019-04-10 22:16:09 +01:00
luisramos0
5791eba9bd
Enhance orders edit page spec to verify that shipping method can be edited and that shipping methods of other distributors are not listed
2019-04-10 22:16:09 +01:00
Luis Ramos
4bf9320be8
Merge pull request #3666 from mkllnk/1830-v2-edit-shipping-fees
...
Close adjustments so that updates are effective
2019-04-10 21:58:22 +01:00
Luis Ramos
97c920f1b0
Merge pull request #3667 from mkllnk/3477-display-eligible-adjustments
...
3477 Render only eligible adjustments on the order page
2019-04-10 21:44:16 +01:00
Pau Perez
f20a15e955
Add specs for the cache refresh on variant removal
...
This is failing in `master` but thanks to the VariantDeleter it does work
in v2. This specs prove it.
2019-04-10 16:16:00 +02:00
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 Perez
aa3f0ac577
Reuse #superadmin? in Delayed Job Web route
...
This moves #superadmin? to the user decorator so it can be reused
outside FeatureFlags.
2019-04-04 16:00:27 +02:00
luisramos0
87327f7aa9
Fix specs testing order cancelation email. The email template now needs a order distributor for the signoff part
2019-04-04 13:41:07 +01:00
Maikel Linke
84501b9e41
Move feature spec to controller spec
...
It reduces the runtime (3s instead of 10s).
2019-04-04 17:01:44 +11:00
Maikel Linke
7b116c0982
Remove unnecessary condition from spec
2019-04-04 16:51:18 +11:00
Maikel Linke
72458da465
Comply to code convention using I18n.t in specs
2019-04-04 16:26:52 +11: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
Maikel Linke
7035d57267
Better helper naming and spec cover
2019-04-03 11:13:56 +11:00
luisramos0
40124b7421
Improve downloads_helper clear_downloads method
2019-04-02 11:39:52 +01:00
luisramos0
7cc5940e19
Load DownloadsHelper only for feature specs
2019-04-02 11:39:52 +01:00
luisramos0
e10264af86
Remove xfeature from enterprise fees summmary report spec
2019-04-02 11:39:52 +01:00
luisramos0
d9304916cc
Add chrome driver config to make testing csv downloads with headless chrome possible
2019-04-02 11:39:52 +01:00
luisramos0
c36f7e003b
Adapt assertions to new csv file download logic
2019-04-02 11:39:52 +01:00
luisramos0
4f803eba7e
Add around blocks to clear downloads directory before and after every test
2019-04-02 11:39:52 +01:00
luisramos0
4795832db5
Add spec DownloadsHelper to support testing csv downloads with headless chrome
2019-04-02 11:39:52 +01:00
luisramos0
c291601d9f
Fix rubocop warnings in enterprise_fee_summary report spec
2019-04-02 11:39:52 +01:00
Maikel Linke
500cf925ad
Fix HTML validity and element finding in spec
...
The fixed partial was used twice on the same page. So the used element
id appeared twice on the page which is invalid HTML. It also confused
the spec.
Now we look at the actually displayed text to select the correct
element.
2019-04-02 16:50:44 +11: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
