Pau Pérez Fabregat
ad743a03ac
Merge pull request #2888 from luisramos0/backorders-line-items
...
[Spree Upgrade] Replace allow_backorders with variant.on_demand in the line_item_decorator
2018-11-02 15:45:25 +01:00
Pau Pérez Fabregat
3b85bbe911
Merge pull request #2923 from mkllnk/2882-extract-email-setup-in-specs
...
Extract email setup in specs for easy upgrade
2018-11-02 15:40:19 +01:00
Pau Pérez Fabregat
a910fc50f5
Merge pull request #2926 from luisramos0/2-0-stable-oct-25
...
[Spree Upgrade] Merging master into 2-0-stable (second run in October2018)
2018-11-02 15:37:34 +01:00
Pau Pérez Fabregat
b35b24d4ae
Merge pull request #2914 from luisramos0/checkout-language-bug
...
Fix multi lingual issue in cart and checkout: the user language selection was not being used
2018-10-30 17:46:37 +01:00
Maikel
d63670d675
Merge pull request #2846 from Matt-Yorkley/pi/rename_enterprise_fields
...
[Product Import] Rename enterprise fields and update template
2018-10-30 15:11:02 +11:00
luisramos0
a5d4c50dea
Fix some specs in admin orders. Fixed path to order edit page and some html class identifiers that were changed in spree 2. Subtotal line is gone in spree 2, removed test.
2018-10-26 21:32:16 +01:00
luisramos0
90d7b7f4a0
Merge branch 'master' into 2-0-stable-oct-25
2018-10-25 14:28:58 +01:00
Maikel Linke
e6adb8a3b9
Extract email setup in specs for easy upgrade
...
The way we set up email sending completely changes with Spree 2. This
change encapsulates that code in a single method so that it can be
changed easily and doesn't create further merge conflicts while we are
still working on the master branch and the Spree upgrade.
2018-10-25 13:53:22 +11:00
Pau Pérez Fabregat
ce93c52dfe
Merge pull request #2850 from Matt-Yorkley/password_change_logout
...
Password change logout
2018-10-24 11:43:09 +02:00
Pau Pérez Fabregat
f32e4dddb1
Merge pull request #2902 from luisramos0/more-pending-tests
...
[Spree Upgrade] Mark specs from secondary features as xfeature
2018-10-23 19:00:49 +02:00
luisramos0
034d9ef72a
Refactor multilingual spec: extract method with repeated assertion
2018-10-23 14:10:52 +01:00
luisramos0
9d9f5d38d7
Fix multi lingual issue in cart and checkout: the user language selection was not being used
2018-10-23 14:10:48 +01:00
Luis Ramos
a9b390d0aa
Merge pull request #2761 from HugsDaniel/2744_fix_feature_specs
...
[Spree Upgrade] Fix feature specs for shipping_methods
2018-10-22 23:12:20 +01:00
luisramos0
34d1e6ffdb
Remove pending from bulk_product_update_spec because it's a core spec and should not be left for later in the upgrade process. This reverts PR#2794
2018-10-21 22:13:15 +01:00
luisramos0
2e64226d29
Move all specs in spec/features/admin/subscriptions_spec temporarily to pending
2018-10-21 22:06:31 +01:00
luisramos0
5d36450de2
Move all specs in reports_spec temporarily to pending. There were 6 temporarily pending tests but 3 more were failing
2018-10-21 21:56:55 +01:00
luisramos0
c373d5ab33
Replace usage of global allow_backorders with variant.on_demand in line item sufficient stock method
2018-10-18 19:44:38 +01:00
luisramos0
87cd73ddba
Merge branch 'master' into 2-0-stable-oct
2018-10-15 17:09:26 +01:00
Matt-Yorkley
1c85de6f58
Use producer and distributor for field names
2018-10-12 16:57:13 +01:00
Matt-Yorkley
2c9dc8899a
Update fields in specs
2018-10-12 16:57:13 +01:00
Matt-Yorkley
4760ebb80c
Use global config
2018-10-11 09:04:37 +01:00
Matt-Yorkley
55411af3fa
Improve user account spec
2018-10-09 10:07:41 +01:00
Matt-Yorkley
3ec8c12899
Update account setting spec for updating email address
2018-10-08 20:41:59 +01:00
Pau Pérez Fabregat
875f0c01bc
Merge pull request #2794 from luisramos0/pending_bulk_prod_update
...
[Spree Upgrade] Making BulkOrderUpdateSpec pending, 33 out of 34 tests to be fixed in #2790
2018-10-08 17:51:08 +02:00
Pau Pérez Fabregat
b51bd4aa4b
Merge pull request #2796 from luisramos0/pending_prod_import
...
[Spree Upgrade] Making product import and product importer specs pending, 17 tests to be fixed in #2791
2018-10-08 17:50:48 +02:00
Pau Pérez Fabregat
86d9f4d56a
Merge pull request #2797 from luisramos0/pending_reports
...
[Spree Upgrade] Making reports and reports_controller specs pending, 18 tests to be fixed in #2792
2018-10-08 17:50:25 +02:00
Pau Pérez Fabregat
58a99a7f89
Merge pull request #2692 from Matt-Yorkley/bi/angular_orders
...
Angularise orders page
2018-10-04 21:10:48 +02:00
luisramos0
d2fe203c89
Fixes error undefined 'stock_location' by adding shipment to line_items in the following specs: features/admin/reports_spec, lib/open_food_network/bulk_coop_report_spec, lib/open_food_network/customers_report_spec, lib/open_food_network/order_cycle_management_report_spec, lib/open_food_network/orders_and_fulfillments_report_spec and lib/open_food_network/packing_report_spec
2018-10-01 11:57:36 +01:00
luisramos0
1ff1e32398
Making reports and reports_controller specs pending, 18 tests to be fixed in issue #2792
2018-09-30 00:30:49 +01:00
luisramos0
7dfce6c368
Making product import and product importer specs pending, 17 tests to be fixed in issue #2791
2018-09-30 00:21:43 +01:00
luisramos0
50ac519dd5
Making BulkOrderUpdateSpec pending, 33 out of 34 tests to be fixed in issue #2790
2018-09-30 00:04:33 +01:00
luisramos0
6c05be9772
Fixed 22 out of 30 broken tests in bulk_order_management_spec.rb by providing target_shipment in test line_items.
2018-09-27 21:13:11 +01:00
Luis Ramos
f0183cd17e
Merge pull request #2762 from luisramos0/2-0-order-model-spec
...
[Spree Upgrade] Fixed updates of order.shipping_method_id and improved order, stock_location and shipment factories
2018-09-27 13:43:58 +01:00
Pau Pérez Fabregat
060b3c55f1
Merge pull request #2751 from luisramos0/2-0-order-details
...
[Spree Upgrade] Refactored spree/order_details, extracted delivery and pickup details into separate partials
2018-09-27 14:30:42 +02:00
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
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
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
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
Hugo Daniel
0dd1b1a976
Fix feature specs for shipping_methods
2018-09-24 12:40:59 +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
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
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
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
b2551b4e0b
Rewrite existing specs
2018-09-19 13:00:30 +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
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
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
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
