6330 Commits

Author	SHA1	Message	Date
Maikel Linke	aef5cebeed	Fix flaky spec by waiting for modal animation ... Without waiting, `fill_in` can fail randomly: https://github.com/teamcapybara/capybara/issues/1890	2019-03-20 12:15:01 +11:00
luisramos0	90a14d426b	Add spec to cover editing on_hand and on_demand values in the variants edit page	2019-03-18 17:04:59 +00:00
luisramos0	22a051e720	Enable products cache by default only in staging and production ... We keep tests running by default without cache, keeping it as it was before 10a79d5a65 Additionally, cached_products_renderer no longer depends on Rails.env, so here we remove that dependency from it's spec.	2019-03-17 15:03:15 +00:00
luisramos0	60ee17204b	Merge branch 'master' into 2-0-stable-Mar16	2019-03-16 16:17:38 +00:00
Kristina Lim	3ab00d862e	Create subscriptions with set up shipping methods ... The shipping methods are updated to their target settings after the subscription order has been created, so the order is created with the "require_ship_address" factory default which is "true". The shipping method setting at time of order creation has implications on whether a shipment is set up for the order or not.	2019-03-15 03:15:55 +08:00
Kristina Lim	ba100a6522	Specify order addresses in some OrderSyncer specs ... This is to check that we are using the correct address data in assertions. This also clarifies the scenario for one of the specs.	2019-03-15 03:15:55 +08:00
Kristina Lim	7200e2c2c2	Specify hub address in some OrderSyncer specs ... This fixes some assertions from using the same subscription shipping and billing addresses, and distributor address. One of the specs also pass because the subscription shipping address matches the distributor address. This commit makes that scenario clearer.	2019-03-15 03:15:55 +08:00
Kristina Lim	ad935e8d66	Require spec_helper.rb for OrderSyncer specs	2019-03-15 03:15:54 +08:00
Pau Perez	e60437c6a2	Refactor test to execute public API instead	2019-03-14 18:53:11 +01:00
Pau Perez	b9636b975a	Refactor test to stop using .any_instance ... Although might be useful in very particular cases its use is discourage by RSpec itself. See https://relishapp.com/rspec/rspec-mocks/docs/working-with-legacy-code/any-instance	2019-03-14 18:53:11 +01:00
Pau Perez	bc34d04c31	Do not retry when refreshing cache on deleted OC	2019-03-14 18:53:11 +01:00
Pau Pérez Fabregat	13b2115a29	Merge pull request #3581 from coopdevs/cache-stylistic-improvements ... Cache stylistic improvements	2019-03-13 19:05:38 +01:00
luisramos0	7a2bc384d5	Re-add spec removed in product distributions removal but now adapted to use order cycles	2019-03-13 12:24:40 +00:00
luisramos0	34d7070c6c	Delete spec used to test product distributions (removed feature)	2019-03-13 12:24:40 +00:00
luisramos0	05d42d475e	Make reports and subscriptions specs work without product.distributors attribute	2019-03-13 12:24:40 +00:00
luisramos0	2de6c46834	Make order.order_cycle required in cart_service. There’s no more exception for that without product_distributions.	2019-03-13 12:24:40 +00:00
luisramos0	4768ca27c7	Remove all dependencies to product distributions including the validation to avoid deleting fees with product distributions	2019-03-13 11:50:35 +00:00
luisramos0	3117dbf624	Remove product distributions from order model	2019-03-13 11:50:35 +00:00
luisramos0	a022cebfc8	Remove product distributions from enterprise model and controller	2019-03-13 11:49:13 +00:00
luisramos0	ed9321e92d	Remove product distributions from product model and controller	2019-03-13 11:47:50 +00:00
luisramos0	86f9b3d663	Delete product_distributions: drop table and remove models, controllers and BO edit page	2019-03-13 11:47:50 +00:00
Kristina Lim	8782f2087c	Use service in admin/payments#create ... This separates logic for bang and non-bang versions of Spree::Order#next. The different conditions used in both methods (state == "completed" vs order.completed?) have implications in whether a transition is attempted or not.	2019-03-13 17:00:31 +11:00
Kristina Lim	0e691815ea	Use service in admin/orders/customer_details#update	2019-03-13 12:45:57 +08:00
Kristina Lim	56e2ee5366	Fix specs for OrderSyncer	2019-03-13 12:45:56 +08:00
Kristina Lim	0cfee37567	Fix setup records for SubscriptionPlacementJob specs	2019-03-13 12:45:56 +08:00
Kristina Lim	7c3433425f	Fix setup records for OrderFactory specs	2019-03-13 12:45:55 +08:00
Kristina Lim	182fde58e5	Uncomment now passing tests related to subscriptions	2019-03-13 12:45:55 +08:00
Kristina Lim	54991f8191	Retain shipping method when transitioning order	2019-03-13 12:45:53 +08:00
Kristina Lim	7a8bf76123	Move transitioning of order in admin/orders#edit to service	2019-03-13 12:45:50 +08:00
luisramos0	2295981375	Merge branch '2-0-stable' into 2-0-remove-unused-new-v2-features	2019-03-12 16:55:48 +00:00
Pau Pérez Fabregat	2dd55770fe	Merge pull request #3569 from luisramos0/delete-more-overrides ... Delete some more dead overrides and more dead code	2019-03-12 17:48:12 +01:00
Kristina Lim	f42eb3dab1	Create shipment when creating a order for a subscription ... A spec has been added to check that the attributes for the order states after "cart" ("address", "delivery", "payment") are retained if the order is transitioned to completion, BUT currently this is passing because it is the only shipping method available.	2019-03-12 18:31:27 +08:00
Kristina Lim	5f571aad2f	Set required ship address in order in spec ... The ship address of the order is properly set in ProxyOrder#initialise_order! through OrderFactory. The source of these spec failures seem to be a matter of how the records are set up for the tests.	2019-03-12 18:31:26 +08:00
Maikel	b94c6c1fb6	Merge pull request #3580 from luisramos0/2-0-stable-Mar6 ... [Spree Upgrade] Merging master into 2-0-stable (1st run in Mar2019)	2019-03-12 11:44:41 +11:00
Maikel Linke	49a6b5224d	Remove duplicate expectations from spec	2019-03-12 11:35:06 +11:00
Pau Perez	931cb89a9d	Move new class to services and rename it	2019-03-11 18:28:25 +01:00
Luis Ramos	f6ecf3de64	Merge pull request #3568 from luisramos0/2-0-improve-order-factories ... [Spree Upgrade] Improve order factories	2019-03-08 09:43:26 +00:00
Maikel Linke	e00a3ee263	Use clearer and more reliable waiting in spec	2019-03-08 17:24:31 +11:00
Maikel Linke	52fd7b102e	Unify visiting bulk order management ... DRYing the code allows for easier refactor and more consistency.	2019-03-08 14:46:58 +11:00
Maikel Linke	37d37a6057	Speed up initial spec log in	2019-03-08 14:46:39 +11:00
luisramos0	61f1bf5ec8	Fix shipping_methods edit page missing translation	2019-03-07 17:15:06 +00:00
Pau Pérez Fabregat	e850182f95	Merge pull request #3563 from kristinalim/fix/3562-fix_payment_fee_for_order_based_calculator ... 3562 Fix error calculating payment fee using order-based calculator	2019-03-06 19:31:49 +01:00
Pau Pérez Fabregat	9f8d90cc0a	Merge pull request #3305 from coopdevs/improve-shops-performance-take-2 ... Improve shops performance take 2	2019-03-06 16:25:28 +01:00
Pau Perez	347aa3c4ae	Replace #valid_products_distributed_by by class	2019-03-06 15:06:00 +01:00
Pau Perez	adb40d6c73	Test just the public method ... This one is the one calling the private method that was tested now. It involves some refactoring of the specs as well.	2019-03-06 13:38:53 +01:00
Pau Perez	7c533c6347	Extract DistributedValidProducts from OrderCycle	2019-03-06 13:35:43 +01:00
luisramos0	b325cea6cb	Merge branch 'master' into 2-0-stable-Mar6	2019-03-06 09:19:53 +00:00
Pau Pérez Fabregat	7e06807a11	Merge pull request #3539 from Matt-Yorkley/subs/confirmation_email ... Don't process proxy_order if the order has been cancelled	2019-03-05 17:38:29 +01:00
Pau Pérez Fabregat	3ddee83be5	Merge pull request #3404 from luisramos0/2-0-disable-cache ... [Spree Upgrade] Add checkbox to disable products cache	2019-03-05 14:51:11 +01:00
Pau Pérez Fabregat	30bbc5ee6f	Merge pull request #3472 from pacodelaluna/fix-datetime-picker ... Fix datetime picker on Order Cycle form	2019-03-05 14:50:34 +01:00