raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-27 06:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,630 Commits 15 Branches 460 Tags
e6e4e014dc95da76a6d96cea21fa2fa45380cf21
Commit Graph

10524 Commits

Author SHA1 Message Date
Maikel Linke
02ba8c1bf5 Remove side-effect in JS specs via global var 
The code used the global BulkProducts which was shared amongst a group
of specs. Some were resetting the `products` attribute, others weren't
and the product object of one spec was leaking into the next.

One spec was also referencing a wrong attribute and must have passed
accidentally.
 2023-02-13 12:18:05 +11:00
Konrad
3c83b053ce Merge pull request #10406 from jibees/10402-error-when-no-shipping-info-has-been-selected-in-split-checkout 
SplitCheckout: Fix an issue raised when first time checkout user submit form without selecting shipping method
 2023-02-13 00:36:04 +01:00
Maikel
64032c9207 Merge pull request #10416 from filipefurtad0/flaky_footer_spec 
Addresses flakyness on footer links spec
 2023-02-13 10:12:47 +11:00
filipefurtad0
761a6731db Sets conctext: asserts within the modal 2023-02-10 11:31:18 +00:00
filipefurtad0
b1ca2c90ce Replaces I18n.t() by visible string 
Removes superfluous js: true
 2023-02-10 11:11:10 +00:00
Jean-Baptiste Bellet
b1d22f7982 Customer can be nil if first time they checkout 2023-02-09 17:11:11 +01:00
Jean-Baptiste Bellet
d65b1bb386 Fix various import issue: mock bugsnag 2023-02-09 16:50:40 +01:00
Jean-Baptiste Bellet
2633ee3606 Fix various import issue: taxons 2023-02-09 16:50:40 +01:00
Jean-Baptiste Bellet
4027eacc06 Fix various import issue: module('admin.enterprises') 2023-02-09 16:50:40 +01:00
Jean-Baptiste Bellet
236e77efd4 Fix various import: CurrentUser 2023-02-09 16:50:40 +01:00
Jean-Baptiste Bellet
a486a08bfc Fix various import issues: currentHub 2023-02-09 16:50:40 +01:00
Gaetan Craig-Riou
fd278e0086 Fix bug when submitting form triggered a warning and potentially left submit button disable 
jquery-ujs automatically disable submit button when submitting the form.
If one choose cancel on the leaving page warning, then the submit buttons
end up in a disable state, with no way to re enable them. This fix
prevent the warning from being triggered when submitting the form, so
we can't end up in the scenario described.
 2023-02-08 16:28:41 +11:00
Maikel
66a29e58d2 Merge pull request #10340 from mkllnk/job-process-waiting 
Wait only for report jobs within Puma workers
 2023-02-08 14:26:43 +11:00
Gaetan Craig-Riou
313fdab346 Fix rubocop warnings 2023-02-08 12:04:05 +11:00
Gaetan Craig-Riou
722b04a211 Add missing collumns on new_products page 
It also includes specs for ProductComponent
 2023-02-08 12:04:05 +11:00
Filipe
0f203a474c Merge pull request #10375 from jibees/10363-bom-page-is-not-finding-or-displaying-name-email-or-order-number-for-some-orders 
BOM: Ensure orders informations are loaded for each line items
 2023-02-07 16:34:57 +00:00
cyrillefr
c37564eea7 Modify spec for orders bulk cancelling 2023-02-07 15:49:56 +01:00
cyrillefr
abf90b8437 Modify spec for orders 2023-02-07 15:40:40 +01:00
Ana Nunes da Silva
f4980fa84d Update void payments to checkout on resumed order 2023-02-07 12:29:59 +00:00
Ana Nunes da Silva
b48b3ad42b Update: Untaken cash payments to void on cancelled order 2023-02-07 12:27:07 +00:00
Maikel
9ff8433a8d Merge pull request #10344 from filipefurtad0/update_orders_spec_II 
Update orders spec ii
 2023-02-06 14:32:14 +11:00
Jean-Baptiste Bellet
bddd887dcd Load orders only if current line_items are loaded 
+ update spec as well
 2023-02-03 12:25:47 +01:00
jibees
5e689b12fe Merge pull request #10345 from mkllnk/rspec-n 
Enable RSpec's status file for --next-failure
 2023-02-02 16:54:37 +01:00
Filipe
99a0056d7f Merge pull request #10257 from rioug/9720-fix-imperial-weight-display-when-using-float-value 
Fix decimal display for imperial weight on Cart, Order Confirmation page and Confirmation emails
 2023-02-02 15:03:39 +00:00
Rachel Arnould
0973e79a91 Merge pull request #10274 from jibees/8905-convert-popup-to-flash-messages- 
On `/cart` page, if consumer adds more quantity than available, use in-app flash message instead of native alert
 2023-02-02 15:50:17 +01:00
Filipe
d0897ec677 Merge pull request #10248 from jibees/10117-reports-in-order-cycle-customer-totals-incorrect-sorting-when-lastname-first-letter-isnt-capitalized 
Reports, Orders and fulfillment: Sort by customer lastname + firstname case insensitive
 2023-02-02 14:39:10 +00:00
Jean-Baptiste Bellet
f5aae5f8b9 Remplace ouf of stock alert by Flash message 2023-02-02 15:28:35 +01:00
Filipe
1e3f754f96 Merge pull request #10318 from dacook/10272-remove-currency-from-calculators 
Remove unused currency from calculators
 2023-02-01 13:49:51 +00:00
Gaetan Craig-Riou
5cfedddba4 UnsavedChanges controller, disabling submit button is now optional 2023-02-01 13:46:30 +11:00
David Cook
01c6a8b9ec Merge pull request #9850 from openfoodfoundation/dependabot/bundler/rspec-rails-6.0.1 
Bump rspec-rails from 5.1.2 to 6.0.1
 2023-02-01 11:43:57 +11:00
Gaetan Craig-Riou
dd876dfd8d Order cycle form, disable the save and save and back button on page load 
Buttons will be enabled once the form has been interacted with.
Update unsavedChanges stimulus controller to handle this. It should
still be generic enought that it can be reused.
 2023-02-01 09:43:28 +11:00
Gaetan Craig-Riou
ef309c0fd0 Order cycle form, checkout options steps add user warning when leaving page and form has been changed 
Add UnsavedChanges stimulus controller, it should be generic enough so
that it can reused somewhere else. It works with both 'beforeunload' event
and 'turbolinks:before-visit' when using turbo links.
 2023-02-01 09:43:28 +11:00
filipefurtad0
5d4ab5c1f8 Adds the bang! when updating DB entries 2023-01-31 12:20:26 +00:00
Maikel Linke
d3251dc03f Enable RSpec's status file for --next-failure 
With this config, we can use `rspec -n` which is shorthand for:

  rspec --only-failures --fail-fast --order defined

This is much easier than running specs by line numbers.
 2023-01-31 15:45:21 +11:00
Maikel Linke
d3b80b7fc9 Clarify expecting a hash, not keyword arguments 
The syntax was ambiguous and nwer version of rspec-rails catch that.
 2023-01-31 15:40:33 +11:00
filipefurtad0
444d689f14 Adds ordering by order total 2023-01-30 20:12:38 +00:00
filipefurtad0
801ebe5819 Adds ordering by billing address name 2023-01-30 20:12:38 +00:00
filipefurtad0
7f4e5d3f2e Adds ordering by customer name 2023-01-30 20:12:38 +00:00
filipefurtad0
107bb3df66 Adds ordering by shipment state 2023-01-30 20:12:38 +00:00
filipefurtad0
dcbf2ae96b Removes assertions on the Loading element 2023-01-30 20:12:38 +00:00
filipefurtad0
f2c0a77641 Adds ordering by payment state 2023-01-30 18:39:51 +00:00
filipefurtad0
958a1bde9f Adds ordering by order state 2023-01-30 17:35:23 +00:00
filipefurtad0
cff06011f1 Fixes rubocop issues; Adds ordering by order number 2023-01-30 17:21:29 +00:00
filipefurtad0
0e878d8ce1 Sets context for filters; Adds context for ordering 2023-01-30 17:08:03 +00:00
Filipe
678c60c9b6 Merge pull request #10175 from abdellani/tax_totals_with_rates_by_producer_report 
Tax Totals with Rates by Producer Report
 2023-01-30 13:56:48 +00:00
Maikel Linke
1609cc49e3 Wait only for report jobs within Puma workers 
Otherwise a root Puma worker will try to wait for its other child
processes as well while they live a long time.
 2023-01-30 16:28:59 +11:00
filipefurtad0
994232f6d1 Adds pagination test on orders page 2023-01-28 17:50:28 +00:00
Jean-Baptiste Bellet
634a54e3f1 Add image in description as they are now authorized 2023-01-26 18:21:28 +01:00
Jean-Baptiste Bellet
8f519eaf21 Factorize expects and include testing html inside modal and in description 2023-01-26 18:21:28 +01:00
Jean-Baptiste Bellet
dd0957fa72 Remove test no related to consumer spec 
Furthermore, this test is more about testing the text editor (itself) which is an external library
 2023-01-26 18:21:28 +01:00