Maikel Linke
600c8fcd4c
Send confirmation emails immediately
...
Using deferred methods on the user model breaks delayed jobs when the
user is deleted while the job still exists. We could create a proper job
referencing a user id for sending these emails instead. But since the
user has to wait for the confirmation email anyway, we can send it
within the current request. This should be revised if performance
becomes an issue.
Sending the email directly also has the advantage that we can tell the
user if emailing failed. See the following commits.
This change impacts a bunch of specs as we now need a working email
setup to create unconfirmed users. This commit introduces a custom
matcher to unify testing for confirmation emails.
2018-09-27 13:33:08 +10:00
Matt-Yorkley
2dcc8ea4bb
Add spec for pending payments service
2018-09-25 10:05:32 +01:00
Maikel
51f9a0afa1
Merge pull request #2562 from Matt-Yorkley/pi/product_attributes
...
[Product Import] Product attributes
2018-09-25 11:36:03 +10:00
luisramos0
4f32a8efc2
Fixed shipment factory by making shipments unique per order and stock_location factory by making stock_location unique
2018-09-25 00:49:03 +01:00
Pau Perez
eb64569c9a
Destroy all shipments when clearing order
...
Now we only clear the order's shipping_method, and in Spree 2.0 it can
have many shipments.
2018-09-24 15:25:33 +01:00
luisramos0
89114655fd
Fixed shipping_method update in features/consumer/shopping/orders_spec, order.shipment is now updated instead of order.shipping_method_id
2018-09-24 15:13:36 +01:00
luisramos0
4476b88044
Fixed shipping_method update in models/spree/order_spec, order.shipment is now updated instead of order.shipping_method_id
2018-09-24 15:13:36 +01:00
luisramos0
99fff3d279
Fixed factory completed_order_with_fees by skipping a failing and unnecessary part of the checkout workflow
...
Fixed factory's shipment_with shipping_fees trait by ensuring only one shipping_rate in the shipment
2018-09-24 15:13:35 +01:00
Luis Ramos
08104c62be
Merge pull request #2667 from luisramos0/2-0-ship-method-last-used-address
...
[Spree Upgrade] Adapt Address_Finder.last_used_ship_address to spree 2
2018-09-24 15:07:27 +01:00
Luis Ramos
0eb2854f8a
Merge pull request #2680 from luisramos0/2-0-stable-x
...
[Spree Upgrade] Fixed inexistent order#shipping_method= in several specs
2018-09-24 15:07:04 +01:00
Pau Perez
f743b5f02f
Extract Settings from Product Import processor
...
This encapsulates the data structure used by the entry processor to
check various settings. It still requires a lot of work to move more
logic to this new class.
2018-09-24 13:55:33 +02:00
Hugo Daniel
0dd1b1a976
Fix feature specs for shipping_methods
2018-09-24 12:40:59 +02:00
Pau Pérez Fabregat
b8417058b4
Merge pull request #2741 from coopdevs/refactor-checkout-process-bits
...
Refactor checkout process bits
2018-09-24 12:08:19 +02:00
Pau Pérez Fabregat
128ec1623a
Merge pull request #2760 from luisramos0/2-0-admin-enterprise-spec
...
[Spree Upgrade] In admin enterprises spec, replacing select2_search with select2_select
2018-09-24 11:15:18 +02:00
Pau Pérez Fabregat
52a412a218
Merge pull request #2638 from coopdevs/unit-test-variant-stock
...
Unit test variant stock
2018-09-24 11:14:03 +02:00
Maikel
9d48ea7b62
Merge pull request #2759 from luisramos0/del_old_spec_helper
...
Removed deprecated spec helper have_select2_option and fixed its last usage
2018-09-24 11:25:51 +10:00
Maikel
26eb79f5f2
Merge pull request #2729 from luisramos0/2-0-ship-method-curr-order-ser
...
[Spree Upgrade] Replace order.shipping_method_id in current_order_serializer
2018-09-24 08:56:21 +10:00
luisramos0
a04e90d188
In admin enterprises spec, replacing select2_search with select2_select makes all tests pass. Also made screen size longer to avoid errors with overlaying components
2018-09-20 23:58:14 +01:00
luisramos0
33d2b65d65
Removed deprecated spec helper have_select2_option and fixed its last usage
2018-09-20 23:01:23 +01:00
luisramos0
2a68184c01
Deleted unused test helper for rabl views
2018-09-20 20:09:14 +01:00
luisramos0
0e6b0aa248
Deleted sample specs and one pending spec
2018-09-19 23:45:00 +01:00
Matt-Yorkley
fc68e28e4d
Add :description to non-updatable attributes list
2018-09-19 22:30:10 +01:00
Matt-Yorkley
b57c6cf9ac
Add errors when attempting to update non-updatable fields
2018-09-19 21:12:29 +01:00
luisramos0
57bb1fec9a
Adapt ShippingMethodsController to keep disallowing delete of shipping_methods associated with orders. Added controller tests to verify behaviour
2018-09-19 16:21:12 +01:00
Pau Pérez Fabregat
99ba9d7d1b
Merge branch '2-0-stable' into unit-test-variant-stock
2018-09-19 15:41:21 +02:00
Pau Perez
b77dd41eb0
Refactored spree/order_details, extracted delivery and pickup details into separate partials.
...
This was copied/adapted from 6f7c8bb8b1
2018-09-19 14:20:44 +01:00
Matt-Yorkley
9ce32e3c14
Add new ordersCtrl spec
2018-09-19 13:00:30 +01:00
Matt-Yorkley
64620c2797
Tidy up response formats for easier testing
2018-09-19 13:00:30 +01:00
Matt-Yorkley
6768055b4d
Split orders into 2 angular controllers
2018-09-19 13:00:30 +01:00
Matt-Yorkley
b2551b4e0b
Rewrite existing specs
2018-09-19 13:00:30 +01:00
luisramos0
edcdf59621
In current_order_serializer, serialize shipping_method_id from order.shipping_method.id. Adapted respective spec.
2018-09-18 16:11:01 +01:00
Pau Perez
314ad5400f
Move variant_stock.rb to concerns/
2018-09-18 12:18:50 +02:00
Pau Perez
2a0e0eed73
Move state_machine's additions inside class_eval
...
And also cover them with tests.
2018-09-18 11:20:32 +02:00
Pau Perez
1fdc578901
Increase readability (a bit) of OrderUpdater
2018-09-18 11:20:32 +02:00
Pau Perez
99cdeca0b1
Remove useless RSpec context block
2018-09-18 11:20:32 +02:00
Pau Perez
13f73b4512
Test :restart_checkout state machine event
2018-09-18 11:20:32 +02:00
Maikel
19df4ff640
Merge pull request #2701 from mkllnk/2700-improve-product-refresh-scheduling
...
2700 improve product refresh scheduling
2018-09-18 12:09:24 +10:00
luisramos0
c22ac0086b
Moved cookies_policy_helper to Web engine and respective spec
2018-09-17 16:05:38 +01:00
luisramos0
843cd44b23
In paypal_spec, fixed setting shipping_method in order, this is now done through order shipments
2018-09-17 00:51:01 +01:00
luisramos0
c66b611b99
Fixed setting shipping_method in the order through order.shipments in proxy_order_spec, lib/open_food_network/customers_report_spec and features/admin/shipping_methods_spec
2018-09-17 00:51:01 +01:00
luisramos0
75656668cd
Fixed query in order_cycle_management_report and fixed the respective spec by setting shipping_method in order through shipments
2018-09-17 00:51:01 +01:00
luisramos0
38c2f52278
In features/admin/reports_spec, fixed setting shipping_method in order, this is now done through order shipments
2018-09-17 00:51:01 +01:00
luisramos0
fbd2d96b05
Moved shipment and shipping_method factories with flat rate and shipping fees to traits
2018-09-17 00:51:01 +01:00
luisramos0
7b6e4825e7
Fixed controllers/spree/admin/orders/customer_details_controller_spec:
...
- fixed order creation to use order.shipments instead of order.shipping_method
- adapted test to new spree 2 controller logic (shipments page is gone since 67f568914988bcc0a1fc520d15ed6444a6d12824 and redirect logic changed on e9cde1b4d570dd4f7f979ac71a58d6f3f342ebb4)
2018-09-17 00:44:14 +01:00
luisramos0
93ac99b5cc
Added new factory for shipping_method_with trait delivery to fix order.shipping_method issue in features/admin/orders_spec
2018-09-17 00:44:14 +01:00
luisramos0
8e5f43ed25
Fixed current order serializer spec name
2018-09-14 23:12:00 +01:00
luisramos0
5b3a529487
Adapted address_finder_spec to spree 2 shipments
2018-09-14 18:41:59 +01:00
Maikel
e836ac0234
Merge pull request #2686 from HugsDaniel/2593_customize_user_guide_link
...
Enable setting a customized user guide link in general settings
2018-09-14 15:46:05 +10:00
Maikel
beedd933e9
Merge pull request #2512 from kristinalim/feature-remove_enterprise_images
...
Support removal of enterprise logo and promo image
2018-09-14 15:07:24 +10:00
Maikel
6b56def649
Merge pull request #2697 from mkllnk/2655-fix-admin-payments
...
2655 fix admin payments
2018-09-14 11:26:20 +10:00
