6029 Commits

Author	SHA1	Message	Date
Pau Pérez Fabregat	819af03239	Merge pull request #5706 from luisramos0/ent ... Fix admin enterprises controller spec	2020-07-01 12:28:19 +02:00
Pau Pérez Fabregat	5a72526107	Merge pull request #5692 from luisramos0/taxonomies ... Fix taxonomies flaky spec	2020-07-01 12:26:56 +02:00
Luis Ramos	2dce10bec2	Fix admin enterprises controller spec, for some reason the correct controller is not being picked up in the test	2020-06-30 10:49:45 +01:00
Cillian O'Ruanaidh	a9664e103d	Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes.	2020-06-29 18:11:08 +01:00
Luis Ramos	10b8c2b789	Relax the assertion and dont check row number so that it passes even if order of elements is not the same	2020-06-27 15:54:58 +01:00
Luis Ramos	2ad2836ac6	Merge pull request #5563 from luchiago/fix-missing-closed-oc-info-i18n ... add missing i18n key for closed OC	2020-06-25 20:33:55 +01:00
Luis Ramos	93a2e57bc6	Merge pull request #5538 from jeduardo824/bug/4592-payment-methods-table-in-dashboard ... Fix Payment Methods table to show proper provider name	2020-06-25 20:32:04 +01:00
Pau Pérez Fabregat	3939febc2f	Merge pull request #5653 from luisramos0/rubocop_refresher ... Auto correct rubocop, refresh todo lists and fix some more rubocop issues	2020-06-23 10:25:59 +02:00
Luis Ramos	91fc0cd26f	Adapt specs to new Ar method update that replaces update_attributes	2020-06-22 17:39:20 +01:00
Luis Ramos	f004b3d573	Fix rubocop issue	2020-06-22 17:39:20 +01:00
Luis Ramos	1c550a594f	Fix rubocop issue	2020-06-22 17:39:20 +01:00
Luis Ramos	0ba1642bd2	Fix rubocop issues	2020-06-22 17:39:20 +01:00
Luis Ramos	1e5975c6e2	Fix rubocop issues	2020-06-22 17:39:20 +01:00
Luis Ramos	b879439d58	Use rubocop auto correct to fix Style/SafeNavigation issue	2020-06-22 16:51:46 +01:00
Luis Ramos	f848a89a00	Rename update_attributes to update #rails4	2020-06-22 16:51:43 +01:00
Luis Ramos	46a1c1cf26	Fix rubocop issue	2020-06-22 13:08:54 +01:00
Luis Ramos	473fee19eb	Fix rubocop issues	2020-06-22 13:03:18 +01:00
Luis Ramos	6eebb0e399	Use rubocop autocorrect to fix rubocop issue	2020-06-22 12:58:33 +01:00
Luis Ramos	3b91dd9dea	Use rubocop auto-correct to fix more issues	2020-06-22 12:51:47 +01:00
Luis Ramos	5d710f1e24	Use ruboccop autocorrect to fix issues	2020-06-22 12:46:07 +01:00
Luis Ramos	8a9dae0ee2	Run rubocop autocorrect ... This is the result of bundle exec rubocop --auto-correct	2020-06-22 12:23:10 +01:00
Luis Ramos	15babd8bc4	Merge pull request #5651 from luisramos0/xhr ... [Rails 4.1] Change for xhr rquest to avoid csrf during testing	2020-06-22 12:20:41 +01:00
Luis Ramos	57d925a7de	Add new rubocop rules and fix the single offence	2020-06-22 12:19:19 +01:00
Lucas Hiago	357c2c7b25	change for xhr to avoid csrf during testing	2020-06-21 20:22:33 +01:00
Pau Pérez Fabregat	db80992326	Merge branch 'master' into drop-blockenspiel	2020-06-19 12:12:10 +02:00
Matt-Yorkley	444097c75f	Merge pull request #5559 from luisramos0/display_only_shop ... Make display only shops work again	2020-06-19 11:12:55 +02:00
Matt-Yorkley	5a480439ca	Remove test for items from previous orders looking in cart dropdown ... This feature has been removed	2020-06-18 22:21:55 +02:00
Matt-Yorkley	042b4fc395	Remove tests for viewing previous order items in cart dropdown ... This behavior has been removed	2020-06-18 22:21:55 +02:00
Matt-Yorkley	8ac971651c	Fix flaky spec	2020-06-18 22:21:55 +02:00
Matt-Yorkley	459e53f43d	Adjust specs for new cart display	2020-06-18 22:21:55 +02:00
Luis Ramos	f6e3e01a10	Extract permitted payment_source attributes from checkout to use them in the backoffice payments controller ... Add spec to verify payment source attributes are passed	2020-06-18 09:54:34 +01:00
Pau Pérez Fabregat	8f885dd1c5	Merge pull request #5628 from Matt-Yorkley/flaky-caching-spec ... Flaky caching spec	2020-06-18 09:37:45 +02:00
Luis Ramos	06a37d8ff0	Merge pull request #5566 from rioug/5132-no-error-when-product-csv-malformed ... Add handling of CSV::MalformedCSVError for product_importer	2020-06-17 19:58:35 +01:00
Luis Ramos	5163317b10	Merge pull request #5623 from luisramos0/zones ... Make Zones editable again	2020-06-17 19:41:20 +01:00
Matt-Yorkley	64b5bde952	Wait for page to actually load after visit shops_path	2020-06-17 12:47:08 +02:00
Matt-Yorkley	86fe032cdb	Update calls to #update_attributes! (Rails 4 Rubocop violation)	2020-06-17 12:37:20 +02:00
Matt-Yorkley	640c9e6d2b	Re-enable flaky spec	2020-06-17 12:36:42 +02:00
Lucas Hiago	419b3ef26e	add missing i18n key for check hub ready for checkout	2020-06-16 19:49:43 -03:00
Lucas Hiago	e9e43c985f	add missing i18n key for closed OC	2020-06-16 19:48:24 -03:00
Luis Ramos	01e27dd68c	Merge pull request #5492 from pacodelaluna/include-negative-tax-adjustments-in-sales-report ... Include adjustments with negative taxes on Sales Tax reports	2020-06-16 20:23:04 +01:00
Luis Ramos	2fcafdcf45	Add spec to cover editing zones	2020-06-16 15:13:54 +01:00
Luis Ramos	774b75b649	Make zones spec faster by going directly to zone list page withouth repeating the navigation through Configuration menu	2020-06-16 14:06:01 +01:00
François Turbelin	9abe41f6cb	Use OrderTaxAdjustmentsFetcher service	2020-06-16 14:01:27 +02:00
Matt-Yorkley	cf214251fa	Set flaky caching spec to pending	2020-06-16 12:59:58 +02:00
Luis Ramos	7db519ab62	Merge pull request #5570 from luisramos0/ship_methods_form ... [Spree 2.1] Make Shipping methods form save calculator details	2020-06-15 15:05:50 +01:00
Pau Pérez Fabregat	257b311e04	Merge pull request #5158 from openfoodfoundation/3-0-stable ... Merge 3-0-stable to master	2020-06-15 13:35:58 +02:00
Luis Ramos	d5bdf306a9	Comment out flaky variant overrides spec	2020-06-15 11:43:30 +01:00
Luis Ramos	538d886c83	Merge pull request #5573 from Matt-Yorkley/payment-report-500 ... Fix fatal error in reports helper for orders without payments	2020-06-15 11:27:17 +01:00
Luis Ramos	ea8c5d2711	Comment out flaky spec	2020-06-15 11:01:35 +01:00
Eduardo	27c76cfae2	add view spec to replace feature spec	2020-06-13 14:24:17 -03:00