1046 Commits

Author	SHA1	Message	Date
luisramos0	6f78f3c595	Move all specs in proxy_order_spec temporarily to pending	2018-10-21 22:08:10 +01:00
luisramos0	3afc59c864	Move all specs in products_reset_strategy_spec (part of product import feature) temporarily to pending	2018-10-21 22:04:16 +01:00
luisramos0	5b6b0f408f	Move all specs in product_importer_spec temporarily to pending. There were 11 temporarily pending tests but more were failing	2018-10-21 22:02:34 +01:00
luisramos0	a83af367b4	Fix order_spec related to retrieving previously ordered items ... In spree 2, each completed_order_with_totals comes with 5 line items (see order_factory in spree), so instead of 1+1+1=3 the calculation becomes 5+5+1=11	2018-10-18 10:54:21 +01:00
luisramos0	74eff8730b	Fix tests of fees in a completed order in models/spree/order_spec by: ... - set distributor with taxes on the order - simplify the factory completed_order_with_fees by replacing shipment with shipping_method and ship_address and letting the order workflow handle shipments and inventory units	2018-10-18 10:54:21 +01:00
Luis Ramos	3e4f92fe92	Merge branch '2-0-stable' into 2-0-adjust-basic-spec-fix	2018-10-16 17:33:33 +01:00
Pau Pérez Fabregat	c99fec44da	Merge pull request #2824 from luisramos0/2-0-order-spec ... [Spree Upgrade] Fix taxes tests in models/spree/order_spec	2018-10-16 18:09:33 +02:00
Pau Pérez Fabregat	f2fe3c8cff	Merge pull request #2812 from luisramos0/2-0-adjust-enterprise-fees-spec-fix ... [Spree Upgrade] Fix enterprise fees specs in adjustment_spec - tax_rate	2018-10-16 18:02:21 +02:00
Pau Pérez Fabregat	db9669b4ce	Merge pull request #2817 from coopdevs/remove-reference-to-on-demand ... [Spree Upgrade] Remove on_demand from Product serializers	2018-10-16 17:52:42 +02:00
luisramos0	570016463b	Fix order_updater_spec by using create (instead of build) in shipment. Also simplified spec by using prebuild shipment_with and shipping_method factories	2018-10-16 16:37:36 +01:00
luisramos0	87cd73ddba	Merge branch 'master' into 2-0-stable-oct	2018-10-15 17:09:26 +01:00
Pau Pérez Fabregat	f8bccda6ab	Merge pull request #2847 from Matt-Yorkley/emails/validation ... Emails/validation	2018-10-15 15:54:41 +02:00
Pau Perez	a5a2cb8ea7	Revert "Merge pull request #2856 from luisramos0/2-0-adjust-clean-up" ... This reverts commit fa689b6607, reversing changes made to 2aeed9763c.	2018-10-15 15:48:48 +02:00
Pau Pérez Fabregat	fa689b6607	Merge pull request #2856 from luisramos0/2-0-adjust-clean-up ... [Spree Upgrade] Running Transpec and Rubocop in "new" models/spree/adjustment_spec	2018-10-15 11:13:46 +02:00
luisramos0	a5522b90f6	Fix Shipment adjustments specs on adjustment_spec by setting Config values before test objects are created	2018-10-12 23:09:35 +01:00
luisramos0	5693f44f5e	Fix shipping adjustment basic test in adjustment_spec by removing extra shipping_method from test shipment	2018-10-12 23:09:35 +01:00
luisramos0	3b6d29968d	Fix spree/models/adjustment_spec rubocop issues	2018-10-11 23:02:17 +01:00
luisramos0	6aa8978fe9	Convert specs to RSpec 3.7.1 syntax with Transpec ... This conversion is done by Transpec 3.3.0 with the following command: transpec spec/models/spree/adjustment_spec.rb * 30 conversions from: obj.should to: expect(obj).to * 25 conversions from: == expected to: eq(expected) * 3 conversions from: obj.should_not to: expect(obj).not_to For more details: https://github.com/yujinakayama/transpec#supported-conversions	2018-10-11 23:02:17 +01:00
luisramos0	23ed4f705c	Fix Enterprise Fee tax category inheritance spec by ensuring the line item is assigned to the order when the order is created. That way the tax category from product is correctly copied to the line item	2018-10-11 23:02:17 +01:00
luisramos0	ed429dd20d	Fix models/spree/order_spec tests related to tax on shipments: ... - make Spree::Config be picked up correctly by reordering test object creation - make sure line item is loaded in the order when the order is created	2018-10-11 18:06:33 +01:00
Pau Perez	cbac916e66	Validate unit value when updating variant_unit ... Variants whose product's variant_unit is weight or volume require a unit_value.	2018-10-11 15:52:40 +02:00
Pau Perez	575d76e23e	Cover variant creation and update with basic tests	2018-10-11 15:52:40 +02:00
Pau Perez	f54c69cbba	Add first test case for ProductSet ... This covers creation and update of a product.	2018-10-11 15:52:40 +02:00
luisramos0	39d232daaf	Fix Enterprise Fee tax category inheritance spec by ensuring the line item is assigned to the order when the order is created. That way the tax category from product is correctly copied to the line item	2018-10-09 19:50:35 +01:00
Pau Pérez Fabregat	227dd3e399	Merge pull request #2831 from kristinalim/fix-product_import_date_error ... Fix product import date error when some but not all variants have import date	2018-10-09 16:37:25 +02:00
Matt-Yorkley	8f5fd41c8b	Update email confirmation address	2018-10-08 21:38:47 +01:00
Pau Pérez Fabregat	f5573f419b	Merge pull request #2778 from coopdevs/refactor-entry-processor ... Refactor entry processor	2018-10-08 17:11:23 +02:00
Kristina Lim	da904c908d	Fix product import date when not all variants have it	2018-10-06 03:03:22 +08:00
Pau Perez	75ad4254a6	Remove on_demand from Api::Admin::ProductSerializer ... This change also moves the spec file to its appropriate place for the sake of consistency and RSpec3-izes the test example.	2018-10-03 13:06:13 +02:00
luisramos0	c559cf0394	Fix Shipment adjustments specs on adjustment_spec by setting Config values before test objects are created	2018-10-02 16:17:26 +01:00
luisramos0	795441484d	Fix shipping adjustment basic test in adjustment_spec by removing extra shipping_method from test shipment	2018-10-02 16:15:00 +01:00
Pau Perez	6a7359a3c5	Pass supplier_ids in strategy #reset instead ... This removes the need to expose supplier_ids through #<< and makes both ResetAbsent and its strategies simpler. This could be made even simpler if the strategies just implemented `#relation` as public method and ResetAbsent called `#update_all` on them. The data to be fetched is the only thing that changes but the update is the same.	2018-10-01 17:37:49 +02:00
Pau Perez	82654cd1ee	Turn delegation to a reader to make it simpler ... This makes the solution less smart and as a result ResetAbsent improves it's consistency and returns always an integer.	2018-10-01 16:40:34 +02:00
Pau Perez	148321f7b7	Make strategies class names more explicit	2018-10-01 16:40:34 +02:00
Pau Perez	af93af1a64	Replace strategy with a more explicit name	2018-10-01 16:40:34 +02:00
Pau Perez	fd69c7672d	Add specs for ResetAbsent strategies ... This also fixes the case where there are no overrides to exclude.	2018-10-01 13:12:06 +02:00
Pau Perez	5eb10edbfd	Inject #updated_ids to strategy ... Their values are known beforehand.	2018-10-01 13:12:06 +02:00
Pau Perez	186801a1e2	Remove unused supplier_ids argument	2018-10-01 13:12:06 +02:00
Pau Perez	718f529ede	Use nested module in test to improve readability	2018-10-01 13:12:06 +02:00
Pau Perez	f04fa4ed63	Do not treat ResetAbsent as a decorator anymore ... This fully encapsulates it's logic and reduces its tight coupling with EntryProcessor.	2018-10-01 13:12:06 +02:00
Pau Perez	95ae18a1ba	Remove method delegation	2018-10-01 13:12:06 +02:00
Pau Perez	54d6bc5443	Don't use importing_into_inventory? in ResetAbsent ... This completely decouples ResetAbsent from the particular strategy used.	2018-10-01 13:12:06 +02:00
Pau Perez	a10e58e20a	Inject strategy_factory into ResetAbsent	2018-10-01 13:12:06 +02:00
Pau Perez	a9444b8909	Extract InventoryReset and Products strategies ... Extract this strategy classes from ResetAbsent and move #reset there.	2018-10-01 13:12:06 +02:00
Pau Perez	23471346b6	Do not call ResetAbsent when preconditions not met	2018-10-01 13:12:06 +02:00
Pau Perez	a409353d37	Move import_settings query methods to Settings	2018-10-01 13:12:06 +02:00
Pau Perez	fd84bea463	Test that variants or overrides are actually reset	2018-10-01 13:12:06 +02:00
Pau Perez	b940f06238	Return early if reset_all_absent is not set ... No need to go through half of the algorithm if the setting is not enabled. It does not change per enterprise. This also assumes "Previously we were updating both (products and inventory) at the same time during one import, but now it's one or the other" in Matt's words.	2018-10-01 13:12:06 +02:00
Pau Perez	c955e151b7	Pass enterprise ids as strs as current code does	2018-10-01 13:12:06 +02:00
Pau Perez	5ac3598550	Inject Settings object in ResetAbsent	2018-10-01 13:12:06 +02:00