1310 Commits

Author	SHA1	Message	Date
Maikel	592a468448	Merge pull request #3960 from mkllnk/test-spec-stability ... Remove retries from previously flaky specs	2019-07-02 13:50:16 +10:00
Maikel	4c4881430c	Merge pull request #3908 from kristinalim/fix/3843-unit_type_in_product_import ... 3877,3843 Improve handling of units and unit type in product import	2019-06-21 14:43:01 +10:00
Maikel Linke	cccd35fdf3	Remove retries from previously flaky specs ... It's not acceptable to have flaky specs that only pass once in three tries. Our specs might be more stable now that we use Chrome as test browser. Otherwise we have to find out why these specs are not stable. It might be an important bug that happens only sometimes.	2019-06-19 16:48:04 +10:00
Maikel Linke	ac79e44d9a	Fix current rubocop violations	2019-06-14 11:40:09 +10:00
Luis Ramos	e15ccdbd74	Merge pull request #3840 from mkllnk/3727-default-credit-cards ... Make only reusable credit cards the default card	2019-06-13 14:13:32 +01:00
Luis Ramos	1a2703f630	Merge pull request #3886 from luisramos0/fees_translations ... Make a few more things translatable in the Enterprise Fees management page	2019-06-13 14:12:16 +01:00
Maikel Linke	5c72c35060	Use better credit card factory for subs specs ... The specs for subscriptions were creating simple one-time-use credit cards. They should not be used for subscriptions. After this was fixed in previous commits, these integration tests failed. Now we use a new factory that mimics stored credit cards that can be used for subscriptions.	2019-06-11 18:01:41 +01:00
Kristina Lim	70614de955	Require product import rows to match unit of preceding rows	2019-06-10 04:20:03 +08:00
Luis Ramos	568e3003ba	Merge pull request #3882 from kristinalim/feature/3408-enable_enterprise_fee_summary_for_non_superadmin ... 3408 Remove feature flag for Enterprise Fee Summary	2019-06-06 16:28:36 +01:00
luisramos0	1d4529092f	Make fee type options in enterprise fees page translatable	2019-05-30 00:46:20 +01:00
Kristina Lim	ecea0600b6	Remove feature flag for Enterprise Fee Summary	2019-05-29 02:50:41 +08:00
luisramos0	7397ab4fd8	Run transpec in spec/features/admin/payment_method_spec.rb	2019-05-28 17:04:06 +01:00
luisramos0	ec7e92202b	Run transpec in spec/features/admin/enterprise_user_spec.rb and spec/features/admin/overview_spec.rb	2019-05-28 17:04:06 +01:00
luisramos0	9a21ca38e1	Run transpec in a few more spec/features/admin specs	2019-05-28 17:04:06 +01:00
luisramos0	d2f62f86a9	Run transpec in a few spec/features/admin specs	2019-05-28 16:59:51 +01:00
luisramos0	80537e7e01	Run transpec in spec/features/admin/image_settings_spec.rb	2019-05-28 16:57:11 +01:00
luisramos0	7f43a66fb3	Run transpec in spec/features/admin/adjustments_spec	2019-05-28 16:57:11 +01:00
luisramos0	86b0d71c7e	Result of rubocop auto-correct and rebuilding rubocop_manual_todo	2019-05-28 12:57:29 +01:00
Luis Ramos	6658f85f59	Merge pull request #3758 from jazzdragon/3292-link-popup-text-translation ... 3292 link popup text translation	2019-05-07 21:11:31 +01:00
stveep	a959702905	Add display_name and display_as to admin edit variant page	2019-05-04 17:20:12 +01:00
jazzdragon	b42426a3b8	Add test for existing input alert text	2019-04-27 18:52:23 -07: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
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
luisramos0	e4c54a4954	Add order distributor to shipping method in reports_spec	2019-04-09 23:26:14 +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
luisramos0	40124b7421	Improve downloads_helper clear_downloads method	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	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	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
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
Maikel Linke	5760aed6a6	Render only eligible adjustments on the order page ... https://github.com/openfoodfoundation/openfoodnetwork/issues/3477 The admin orders edit form was displaying adjustments even if they were "not eligible". For example, an additional fee with amount `0` is not eligible. They were already hidden in the adjustments view and we are hiding them in reports.	2019-03-29 18:41:38 +11:00
Maikel Linke	fabca84001	Close adjustments so that updates are effective ... Spree 2.0 keeps shipping fee adjustments open unless they are manually closed. But open adjustments cannot be edited. To preserve updates, like changing the amount of the shipping fee we close the adjustment first.	2019-03-29 17:23:15 +11:00
Maikel	7348987567	Merge pull request #3315 from luisramos0/2-0-phase2-pi ... [Spree Upgrade] Phase 2 - Product Import ready - all specs running and green	2019-03-29 15:16:35 +11:00
Maikel Linke	ef882b8293	Wait for entered tag before submitting ... The changed spec was failing from time to time. This change seems to make it stable. It may be worth moving tag entering into a helper that verifies that the tag was entered (waits for it).	2019-03-27 10:58:00 +11:00
luisramos0	5ce762a600	Uncomment product import specs so we can make them work in v2	2019-03-26 11:34:04 +00:00
luisramos0	c1d14686a6	Merge branch 'master' into 2-0-stable-Mar22	2019-03-22 10:55:17 +00:00
Pau Pérez Fabregat	846e6fdd90	Merge pull request #3560 from kristinalim/fix/2788-shipping_method_id_in_shipments ... 2696,2788 [Spree Upgrade] Fix use of shipping method ID for subscriptions	2019-03-22 11:08:23 +01:00
Pau Pérez Fabregat	87f0ddabe7	Merge pull request #3548 from luisramos0/2-0-remove-unused-new-v2-features ... [Spree Upgrade] Remove unused spree v2 features	2019-03-22 10:35:15 +01:00
Maikel	f1ac33f304	Merge pull request #3590 from mkllnk/3576-bulk-order-spec ... 3576 Fix bulk order management race condition	2019-03-21 12:40:41 +11:00
Pau Pérez Fabregat	4f82808243	Merge pull request #3617 from luisramos0/edit-variants-specs ... Add spec to cover editing on_hand and on_demand values in the variants edit page	2019-03-20 09:13:56 +01:00
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	05d42d475e	Make reports and subscriptions specs work without product.distributors attribute	2019-03-13 12:24:40 +00:00