raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-12 23:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,243 Commits 19 Branches 453 Tags
da34e7b780cc26c598166e06da60fc3608b59a0c
Commit Graph

31243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ahmed Ejaz
da34e7b780 11060 - fix undefined method tax_category_options error in specs 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
aad48b4670 11060 - use SearchableDropdownComponent for categories or tax categories 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
f6efd47af2 11060 - use SearchableDropdownComponent for producer names 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
c153ff75f3 11060 - add searchable dropdown component 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
b577a81f48 11060 - add tax category field 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
5050c2e02b 11060 - remove producer name from variant 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
4360ddde03 11060 - add variant categories dropdown 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
ec4b920f8b 11060 - implement scenario 1 2024-05-07 14:59:14 +02:00
Ahmed Ejaz
2fdaa8b9ec 11060 - implement the scenario 2 and 3 2024-05-07 14:59:14 +02:00
Maikel
dd4fe86e9f Merge pull request #12423 from filipefurtad0/legacy_checkout_migrate_checkout_spec 
Updates checkout tests to cover for out of stock variant
 2024-05-07 14:07:43 +10:00
Gaetan Craig-Riou
aaaa4a4873 Merge pull request #12438 from openfoodfoundation/dependabot/bundler/spring-4.2.1 
chore(deps-dev): bump spring from 4.2.0 to 4.2.1
 2024-05-07 11:41:18 +10:00
Gaetan Craig-Riou
05c9c7124b Merge pull request #12440 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.6.5 
chore(deps): bump @floating-ui/dom from 1.6.4 to 1.6.5
 2024-05-07 11:38:19 +10:00
David Cook
11507ba036 Merge pull request #12432 from mkllnk/migrate-n8n 
Update links to n8n server
 2024-05-07 09:31:26 +10:00
dependabot[bot]
b7b8efbc69 chore(deps): bump @floating-ui/dom from 1.6.4 to 1.6.5 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.6.4 to 1.6.5.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Changelog](https://github.com/floating-ui/floating-ui/blob/master/packages/dom/CHANGELOG.md)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.6.5/packages/dom)

---
updated-dependencies:
- dependency-name: "@floating-ui/dom"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-06 09:50:09 +00:00
dependabot[bot]
ca5f196447 chore(deps-dev): bump spring from 4.2.0 to 4.2.1 
Bumps [spring](https://github.com/rails/spring) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/rails/spring/releases)
- [Changelog](https://github.com/rails/spring/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rails/spring/compare/v4.2.0...v4.2.1)

---
updated-dependencies:
- dependency-name: spring
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-06 09:08:35 +00:00
David Cook
84da904bb2 Merge pull request #12430 from mkllnk/draft-release 
Remove tag template from link to draft release
 2024-05-06 17:05:22 +10:00
Gaetan Craig-Riou
aa359d22a5 Merge pull request #12435 from openfoodfoundation/dependabot/npm_and_yarn/trix-2.1.1 
chore(deps): bump trix from 2.1.0 to 2.1.1
 2024-05-06 11:40:11 +10:00
Gaetan Craig-Riou
8ad25fdac5 Merge pull request #12433 from mkllnk/rubocop-config 
Explicitely require all rubocop extensions
 2024-05-06 11:39:17 +10:00
Gaetan Craig-Riou
c046d59911 Merge pull request #12418 from dacook/optimise-ci 
Optimise CI
 2024-05-06 11:05:28 +10:00
Gaetan Craig-Riou
f1f5e6d659 Merge pull request #12111 from openfoodfoundation/dependabot/bundler/flipper-and-flipper-active_record-and-flipper-ui-1.2.2 
chore(deps): bump flipper, flipper-active_record and flipper-ui
 2024-05-06 10:45:39 +10:00
dependabot[bot]
30f9f265c3 chore(deps): bump trix from 2.1.0 to 2.1.1 
Bumps [trix](https://github.com/basecamp/trix) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](https://github.com/basecamp/trix/compare/v2.1.0...v2.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-03 09:53:27 +00:00
Maikel
0ddf8309c6 Merge pull request #12434 from openfoodfoundation/revert-12392-fix/duplicate-language-display-new-user-11513 
Revert "Fix Duplicate Language Display on New User Creation"
v4.4.43 		2024-05-03 15:26:23 +10:00
Maikel
a75f3245a0 Revert "Fix Duplicate Language Display on New User Creation" 2024-05-03 15:07:47 +10:00
Maikel Linke
409492ce33 Explicitely require all rubocop extensions 
I think that rspec-rails loaded the other extensions already but Rubocop
was suggesting these extensions to be loaded as well.

The alternative is to disable suggestions of new extensions but that
could hide new shiny tools when they become available.
 2024-05-02 16:34:11 +10:00
Maikel Linke
b0a89372ab Update links to n8n server 2024-05-02 15:55:16 +10:00
Maikel Linke
03c35aaeaf Remove tag template from link to draft release 
The release tag was pre-filled with `v` which was meant to help you type
the release number. But I observed multiple times now that an actual tag
named `v` was created. That tag can be quite annoying in the history.

So let's remove this tiny help to avoid mistakes. I personally use
`script/release/tag` which pre-fills the next tag already.

[skip ci]
 2024-05-02 12:03:58 +10:00
Maikel Linke
2e004a026b Update all locales with the latest Transifex translations 2024-05-02 11:54:34 +10:00
Maikel Linke
ea0558c70e Replace Flipper's built-in test helper 
It fails in CI and features are not seen as enabled. So we copy the
important part of the test helper into our code, which works.

It's probably about the point in time when the adapter is instantiated.
 2024-05-02 11:23:30 +10:00
Mohamed ABDELLANI
75f343b42f Run rails generate flipper:update and rails db:migrate 2024-05-02 11:23:26 +10:00
dependabot[bot]
6b0de6e9e4 chore(deps): bump flipper, flipper-active_record and flipper-ui 
Bumps [flipper](https://github.com/flippercloud/flipper), [flipper-active_record](https://github.com/flippercloud/flipper) and [flipper-ui](https://github.com/flippercloud/flipper). These dependencies needed to be updated together.

Updates `flipper` from 0.26.2 to 1.2.2
- [Release notes](https://github.com/flippercloud/flipper/releases)
- [Changelog](https://github.com/flippercloud/flipper/blob/main/Changelog.md)
- [Commits](https://github.com/flippercloud/flipper/compare/v0.26.2...v1.2.2)

Updates `flipper-active_record` from 0.26.2 to 1.2.2
- [Release notes](https://github.com/flippercloud/flipper/releases)
- [Changelog](https://github.com/flippercloud/flipper/blob/main/Changelog.md)
- [Commits](https://github.com/flippercloud/flipper/compare/v0.26.2...v1.2.2)

Updates `flipper-ui` from 0.26.2 to 1.2.2
- [Release notes](https://github.com/flippercloud/flipper/releases)
- [Changelog](https://github.com/flippercloud/flipper/blob/main/Changelog.md)
- [Commits](https://github.com/flippercloud/flipper/compare/v0.26.2...v1.2.2)

---
updated-dependencies:
- dependency-name: flipper
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: flipper-active_record
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: flipper-ui
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-02 11:22:56 +10:00
Gaetan Craig-Riou
94e3eee793 Update all locales with the latest Transifex translations v4.4.42 2024-05-01 14:44:57 +10:00
Gaetan Craig-Riou
04f77b5791 Merge pull request #12414 from cyrillefr/RedundantPresenceValidationOnBelongs_part_II 
Fix RedundantPresenceValidationOnBelongs on some files (part II)
 2024-05-01 13:00:47 +10:00
David Cook
71b79417b5 Merge pull request #12421 from filipefurtad0/legacy_checkout_multilingual_spec 
Updates multilingual spec to test checkout steps
 2024-05-01 09:55:05 +10:00
filipefurtad0
0583888963 Removes legacy checkout spec 
All test cases are covered within the respective checkout step specs
 2024-04-30 14:23:33 +01:00
filipefurtad0
34bde1caa9 Reverts changes on checkout steps specs 
This can be squashed with the first commit of this PR
 2024-04-30 14:22:30 +01:00
filipefurtad0
729c5f01d4 Adds out of stock check as helper 
As shared examoples, in guest_spec.rb
 2024-04-30 14:18:23 +01:00
filipefurtad0
0f80aca675 Updates checkout tests 
Adds out of stock check as helper
 2024-04-30 12:23:39 +01:00
cyrillefr
521e24d7a6 Requested changes on Fix RedundantPresenceValidationOnBelongs II 
- product id required
 - DB + AR model
 2024-04-30 09:58:24 +02:00
Gaetan Craig-Riou
92e0c218c5 Merge pull request #12420 from openfoodfoundation/dependabot/npm_and_yarn/jquery-ui-1.13.3 
chore(deps): bump jquery-ui from 1.13.2 to 1.13.3
 2024-04-30 10:18:37 +10:00
Gaetan Craig-Riou
40e46283a5 Merge pull request #12419 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.6.4 
chore(deps): bump @floating-ui/dom from 1.6.3 to 1.6.4
 2024-04-30 10:16:36 +10:00
Gaetan Craig-Riou
49837c0665 Merge pull request #12416 from openfoodfoundation/dependabot/bundler/sidekiq-7.2.4 
chore(deps): bump sidekiq from 7.2.2 to 7.2.4
 2024-04-30 10:14:47 +10:00
filipefurtad0
fb5f31375a Adds localization test for checkout steps 
As a logged user
 2024-04-29 19:42:49 +01:00
filipefurtad0
1763c516ec Adds localization test for checkout as a guest 2024-04-29 17:44:42 +01:00
dependabot[bot]
2eebb1153b chore(deps): bump jquery-ui from 1.13.2 to 1.13.3 
Bumps [jquery-ui](https://github.com/jquery/jquery-ui) from 1.13.2 to 1.13.3.
- [Release notes](https://github.com/jquery/jquery-ui/releases)
- [Commits](https://github.com/jquery/jquery-ui/compare/1.13.2...1.13.3)

---
updated-dependencies:
- dependency-name: jquery-ui
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-29 09:31:41 +00:00
dependabot[bot]
e674a66bcf chore(deps): bump @floating-ui/dom from 1.6.3 to 1.6.4 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.6.3 to 1.6.4.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Changelog](https://github.com/floating-ui/floating-ui/blob/master/packages/dom/CHANGELOG.md)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.6.4/packages/dom)

---
updated-dependencies:
- dependency-name: "@floating-ui/dom"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-29 09:31:21 +00:00
David Cook
7e951d4af2 Revert "Separate controllers requiring webpack for testing" 
Arrgh it's not so simple.
It looks like both rspec and knapsack use glob for the pattern, so the pattern needs updating. Hmm that might not be too
 bad, but it makes it even less manageable.

Considering the system specs are a much bigger bottleneck, I'm going to avoid spending more time here.
 2024-04-29 17:12:38 +10:00
David Cook
aeae16a1b4 Separate controllers requiring webpack for testing 2024-04-29 17:12:19 +10:00
David Cook
55ece0553c Revert. JS is still required for most specs 
But models can still run without.

Half of the controller runs also succeeded, so we could potentially separate those ones out.
Hmm, yes only 7 of them. It would save 20s, or 16% of controller CI runtimesi which are 2min. let's try..
 2024-04-29 17:02:09 +10:00
David Cook
1a55ae2035 Skip JS setup for non-JS tests 
These tests don't run in the browser, therefore shouldn't need JavaScript at all.
 2024-04-29 17:02:09 +10:00
David Cook
ce36b81f15 Run multiple rake tasks in one process 
It saves the second unnecessary Rails boot-up (multiple seconds).
 2024-04-29 17:02:09 +10:00