Commit Graph

33677 Commits

Author SHA1 Message Date
Filipe
97ceed6cbe Merge pull request #13263 from chahmedejaz/bugfix/13180-oc-search-on-bom
Fix Order Cycle search on BOM page is not working for more than 5 OCs
2025-05-16 10:59:55 +01:00
Maikel
9c5d393ad1 Merge pull request #13328 from drummer83/typo_exiting
Fix typo in yml files: exiting vs. existing
2025-05-16 15:43:27 +10:00
Maikel
277c51cd51 Merge pull request #13327 from cyrillefr/FixRSpecRailsHttpStatus
Fixes RSpec Rails HttpStatus offenses
2025-05-16 15:41:06 +10:00
Filipe
3efa2832de Merge pull request #13257 from ashishp91/13221-make-shipped-orders-uneditable
13221 - Don't allow shipped orders to be editable
2025-05-15 19:23:33 +01:00
Konrad
943d21a767 Fix typo in yml files: exiting vs. existing 2025-05-15 10:03:48 +02:00
cyrillefr
529f3b85eb Fixes RSpec Rails HttpStatus offenses 2025-05-15 08:46:02 +02:00
Maikel
a37b3ed28b Merge pull request #13325 from cyrillefr/FixRSpecRailsHaveHttpStatus
Fixes RSpecRails HaveHttpStatus rubocop offenses
2025-05-15 12:31:18 +10:00
cyrillefr
7f842d77ea Fixes RSpec Rails HaveHttpStatus cop in services & support 2025-05-14 11:47:03 +02:00
cyrillefr
8135aeaeda Fixes RSpec Rails HaveHttpStatus cop in requests 2025-05-14 11:04:01 +02:00
cyrillefr
5063a772f0 Fixes RSpec Rails HaveHttpStatus cop in controllers 2025-05-14 10:58:04 +02:00
cyrillefr
f810e500b5 Fixes RSpec Rails HaveHttpStatus cop in api v0 2025-05-14 10:46:36 +02:00
cyrillefr
b9e1eb2984 Fixes RSpecRails HaveHttpStatus cop in admin specs 2025-05-14 10:28:57 +02:00
Filipe
371d0fbf79 Merge pull request #13281 from rioug/13172-search-by-tags
[Variant tags] Search products by tags
2025-05-14 07:38:59 +01:00
David Cook
71b65b4b98 Merge pull request #13306 from cyrillefr/FixRubocopNamingVariableNumber
Fixes Rubocop naming variable number
2025-05-14 09:39:32 +10:00
David Cook
ffea1cca81 Replace JB's method with mine
Obviously I'm biased, but I like mine better.
2025-05-13 14:52:20 +10:00
David Cook
d62740da10 Update helper to exclude line items
_scrolls down_ Oh... JB already did that 😆
Nice to see we were thinking along the same lines.
2025-05-13 14:52:06 +10:00
David Cook
fa9ed1a66b Add expectation for other line items 2025-05-13 14:42:46 +10:00
David Cook
3b1f267465 Declare which line items are being expected. 2025-05-13 14:41:03 +10:00
David Cook
cf30b792f9 Refactor: move shared code to context 2025-05-13 14:40:41 +10:00
David Cook
6daf94875a Rename varianbles based on OC number
It was a bit confusing that they don't line up.
2025-05-13 14:23:51 +10:00
cyrillefr
0fcf161889 Requested changes: menu_xx are to be ignored from cop 2025-05-12 17:16:15 +02:00
Gaetan Craig-Riou
7f2638f910 Update app/components/tag_list_input_component/tag_list_input_component.html.haml
replace merge by double splat

Co-authored-by: David Cook <david@redcliffs.net>
2025-05-12 13:23:46 +10:00
David Cook
9034eaa049 Merge pull request #13303 from mkllnk/remove-old-integrations
Remove old integrations and rebalance specs
2025-05-12 12:33:46 +10:00
Gaetan Craig-Riou
b5de7b3c5f Merge pull request #13311 from mkllnk/count-on-hand
Remove useless method
2025-05-12 10:40:16 +10:00
Ahmed Ejaz
db0922a7cf 13180: increase filter time to 1 year 2025-05-12 01:14:51 +05:00
Ahmed Ejaz
6cdff7c4c7 Update all locales with the latest Transifex translations v5.0.27 2025-05-12 00:11:09 +05:00
Maikel Linke
4cd088f7a7 Remove useless method 2025-05-09 11:40:18 +10:00
Maikel
0dab580d3e Merge pull request #13308 from openfoodfoundation/dependabot/npm_and_yarn/hotkeys-js-3.13.10
Bump hotkeys-js from 3.13.9 to 3.13.10
2025-05-09 10:08:52 +10:00
Maikel
5072d65eb7 Merge pull request #13307 from openfoodfoundation/dependabot/npm_and_yarn/trix-2.1.15
Bump trix from 2.1.14 to 2.1.15
2025-05-09 10:07:57 +10:00
Filipe
df81fa89f8 Merge pull request #13293 from cyrillefr/FixStimulusErrorOnPrintingWithBulkAction
Fixes StimulusJS error on printing w bulk action
2025-05-08 22:52:58 +01:00
Filipe
674f88162e Merge pull request #13291 from slothmock/fix-#11967+testing
Fix #11967 - limit variant unit name input
2025-05-08 22:39:20 +01:00
Ashish Gaur
71949701ac Merge branch 'master' into 13221-make-shipped-orders-uneditable 2025-05-08 21:56:46 +05:30
Filipe
d8fa3e2a19 Merge pull request #13292 from mkllnk/oc-notify
Process order cycle emails individually to avoid duplicates
2025-05-08 13:15:00 +01:00
dependabot[bot]
8391ab845f Bump hotkeys-js from 3.13.9 to 3.13.10
Bumps [hotkeys-js](https://github.com/jaywcjlove/hotkeys-js) from 3.13.9 to 3.13.10.
- [Release notes](https://github.com/jaywcjlove/hotkeys-js/releases)
- [Commits](https://github.com/jaywcjlove/hotkeys-js/compare/v3.13.9...v3.13.10)

---
updated-dependencies:
- dependency-name: hotkeys-js
  dependency-version: 3.13.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-08 09:52:44 +00:00
dependabot[bot]
e9a205fec9 Bump trix from 2.1.14 to 2.1.15
Bumps [trix](https://github.com/basecamp/trix) from 2.1.14 to 2.1.15.
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](https://github.com/basecamp/trix/compare/v2.1.14...v2.1.15)

---
updated-dependencies:
- dependency-name: trix
  dependency-version: 2.1.15
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-08 09:52:21 +00:00
cyrillefr
42daf314c4 Fixes variable number naming offenses in spec variables 2025-05-08 09:28:01 +02:00
cyrillefr
55ad9429db Fixes variable number naming offenses in spree module 2025-05-08 09:24:28 +02:00
Maikel Linke
0cf9cf3122 Combine system specs for better balance 2025-05-08 12:11:28 +10:00
Maikel
5d4f8313f3 Merge pull request #13305 from filipefurtad0/split_system_specs
Split system specs
2025-05-08 10:40:57 +10:00
Maikel
4ef17d3794 Merge pull request #13300 from filipefurtad0/fix_flaky_simple_spec_again
Adds tests to toggle the css sections (distributed products)
2025-05-08 10:39:17 +10:00
Maikel
bc3f847a9d Merge pull request #13299 from cyrillefr/FixRubocopNamingMethodParameterName
Fixes NamingMethodParameterName rubocop offense
2025-05-08 10:34:50 +10:00
Ashish Gaur
c4ab8bb1e7 13221 Revert back schema changes 2025-05-07 13:37:55 +05:30
Gaetan Craig-Riou
b82bd6c0dc Per rebview, add missing aria-label translation 2025-05-07 15:18:54 +10:00
Gaetan Craig-Riou
eb1919cce9 Update spec/system/admin/products_v3/index_spec.rb
Co-authored-by: Maikel <maikel@email.org.au>
2025-05-07 14:58:41 +10:00
Gaetan Craig-Riou
652cbd8874 Merge pull request #13294 from openfoodfoundation/dependabot/npm_and_yarn/jasmine-core-5.7.1
Bump jasmine-core from 5.7.0 to 5.7.1
2025-05-07 14:03:45 +10:00
Gaetan Craig-Riou
b3834d0476 Merge pull request #13295 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.7.0
Bump @floating-ui/dom from 1.6.13 to 1.7.0
2025-05-07 14:03:02 +10:00
Gaetan Craig-Riou
532ce7a4d7 Merge pull request #13298 from dacook/cleanup-address-finder
Cleanup AddressFinder
2025-05-07 12:16:04 +10:00
filipefurtad0
af8059c22f Splits shopping_spec 2025-05-06 18:08:51 +01:00
filipefurtad0
e7edc068ef Splits order_spec 2025-05-06 17:25:01 +01:00
Maikel Linke
87f81a51d4 Test system with more workers
System specs have been quite slow, taking up to 10 minutes per worker.
But now that we freed up a worker from linting and two workers from
models, we can add these to the system specs to reduce the time to test
completion.
2025-05-06 11:44:38 +10:00