raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 18 Branches 452 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

28175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filipe
871b2f8816 Merge pull request #10696 from mkllnk/login-as-admin 
Simplify login test helpers
 2023-04-17 12:14:06 +01:00
dependabot[bot]
214bdc6fbe Bump rubocop-rails from 2.19.0 to 2.19.1 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.19.0 to 2.19.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.19.0...v2.19.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-17 10:01:45 +00:00
dependabot[bot]
d2fce053a7 Bump webpack-dev-server from 4.13.2 to 4.13.3 
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.13.2 to 4.13.3.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v4.13.2...v4.13.3)

---
updated-dependencies:
- dependency-name: webpack-dev-server
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-17 09:57:50 +00:00
Jean-Baptiste Bellet
11a7aa9f96 When clicking on "Clear Filters" button, to not reset variant selection 
+ add some specs to cover that particular case
 2023-04-17 11:08:17 +02:00
Jean-Baptiste Bellet
c0203e7091 Refactor by putting two specs into a shared_example 
"It's a Surprise Tool That Will Help Us Later"
 2023-04-17 11:06:23 +02:00
Maikel
44cc5cc665 Merge pull request #10677 from mkllnk/spec-helpers 
Simplify spec helpers
 2023-04-17 16:16:29 +10:00
Maikel Linke
6c8e383ab8 Fix ShipmentMailer preview autoload path 
The Zeitwerk autoloader requires class names and file names to match. In
this case, the class had a Spree namespace without being in a spree
folder. The preview couldn't be displayed. Now it can be displayed.
 2023-04-17 15:18:22 +10:00
Maikel Linke
5c6d9a092e Simplify login spec helpers, avoid long lines 
The `login_as_admin_and_visit` helper was used a lot but isn't really
shorter than:

    login_as_admin
    visit path_visit

Calling those methods separately reduces line length. It also removes
the potential impression that it may be more efficient to use the
helper. Now we have less indirection if one of the calls fails and see
the failing spec line straight away.
 2023-04-17 11:08:32 +10:00
Maikel Linke
8d500a2c27 Remove superflouous login test helper 
It was often used with a `visit` statement after which resulted in
unnecessary page loads. There was only one case where a `visit` was
expected but it wasn't needed either.
 2023-04-17 10:56:51 +10:00
Maikel Linke
425674c4e5 Remove unused return value of admin login helper 
Well, there was one use of the return helper. But I don't think that
it's a very intuitive method.
 2023-04-17 10:56:51 +10:00
Konrad
e91e827f29 Merge pull request #10664 from abdellani/fix-remove-duplicated-cusomter-from-mailing-list-report 
Fix Repeated customer entries on Mailing List Report
 2023-04-16 21:17:33 +02:00
Konrad
8f201c830a Merge pull request #10665 from abdellani/fix-remove-duplicated-cusomter-from-addresses-list-report 
Fix Repeated customer entries on Addresses List Report
 2023-04-16 20:40:56 +02:00
Konrad
1b536d9265 Merge pull request #10601 from abdellani/fix-v1-customers-endpoint-should-only-return-managed-enterprise-customers 
fix: v1/customers endpoint should load customers of managed enterprises only
 2023-04-16 16:22:02 +02:00
Mohamed ABDELLANI
1b8a9244a6 test when user is a non-persisted object 2023-04-15 06:16:40 +01:00
dependabot[bot]
a40e883d17 Bump cable_ready from 5.0.0-rc2 to 5.0.0 
Bumps [cable_ready](https://github.com/stimulusreflex/cable_ready) from 5.0.0-rc2 to 5.0.0.
- [Release notes](https://github.com/stimulusreflex/cable_ready/releases)
- [Changelog](https://github.com/stimulusreflex/cable_ready/blob/main/CHANGELOG.md)
- [Commits](https://github.com/stimulusreflex/cable_ready/commits/v5.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-14 09:57:54 +00:00
Jean-Baptiste Bellet
6bf21d2abd SASS loader: Do not print warnings from dependencies 2023-04-14 11:09:39 +02:00
David Cook
29b9777a96 Replace deprecated sass division operator 
https://sass-lang.com/documentation/breaking-changes/slash-div
> Sass currently treats / as a division operation in some contexts and a separator in others. This makes it difficult for Sass users to tell what any given / will mean, and makes it hard to work with new CSS features that use / as a separator.

There's a handy migrator:

    npm install -g sass-migrator
    sass-migrator division **/*.scss

And it cleverly avoids the need for the ugly division method in most cases.
 2023-04-14 17:59:01 +10:00
David Cook
283dd84ad6 Add expected whitespace 
The migrator refused to proceed until I fixed this.
 2023-04-14 17:56:24 +10:00
Maikel Linke
03828c5608 Style Rails/ToSWithArgument 2023-04-14 16:34:51 +10:00
Maikel Linke
dad4061ff9 Style Rails/ToFormattedS 2023-04-14 16:32:39 +10:00
Maikel Linke
b19df0dfbf Enable new Rubocop cops 
This detects an additional 639 offenses which I added to the todo file.
From now on, when Dependabot bumps rubocop the build may fail due to new
cops. But that's a great opportunity to utilise those new cops and fix
violations straight away. Otherwise we'll never get to them and lose out
on useful autocorrection, for example for updating deprecated syntax.
 2023-04-14 16:28:20 +10:00
Maikel Linke
efb2ae6843 Style Rails/Pick - rubocop passes completely 2023-04-14 16:22:46 +10:00
Maikel Linke
407fca17cb Style Rails/IndexWith 2023-04-14 16:19:21 +10:00
Maikel Linke
33409725a5 Run rubocop-rails with current Rails version 7.0 
This adds three new issues I will address in the next commits.

```
Offenses:

app/json_schemas/json_api_schema.rb:40:7: C: [Correctable] Rails/IndexWith: Prefer index_with over to_h { ... }.
      relationships.to_h { |name| [name, relationship_schema(name)] }
      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
lib/reporting/reports/enterprise_fee_summary/base.rb:18:11: C: [Correctable] Rails/IndexWith: Prefer index_with over map { ... }.to_h.
          data_attributes.map { |attr| [attr, I18n.t("header.#{attr}", scope: i18n_scope)] }.to_h
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
lib/reporting/reports/sales_tax/sales_tax_totals_by_order.rb:140:14: C: [Correctable] Rails/Pick: Prefer pick('sum(amount)') over pluck('sum(amount)').first.
            .pluck('sum(amount)').first || 0
             ^^^^^^^^^^^^^^^^^^^^^^^^^^

1404 files inspected, 3 offenses detected, 3 offenses autocorrectable
```
 2023-04-14 16:15:13 +10:00
Maikel Linke
c70a694111 Style line length - rubocop passes completely 2023-04-14 16:12:14 +10:00
Maikel Linke
9c88c77066 Style empty lines 2023-04-14 16:05:50 +10:00
Maikel Linke
42585bb074 Remove redundant cop disable directive 2023-04-14 16:04:57 +10:00
MadisonBowron
697f2795d4 Remove arbitrary comments 2023-04-14 01:25:14 -04:00
Maikel
b0211d0930 Merge pull request #10686 from filipefurtad0/truncates_product_description 
Sets too long line truncation spec as pending
 2023-04-14 15:11:31 +10:00
Maikel
0675422509 Merge pull request #10678 from dacook/show-commit-in-ci 
Show commit in CI
 2023-04-14 14:43:44 +10:00
Maikel
5ff1b0d358 Merge pull request #10676 from filipefurtad0/fix_spec_ts_and_cs 
Adds pending test for default ToS
 2023-04-14 14:00:32 +10:00
Maikel Linke
43cbac7d17 Simplify report filename generation 2023-04-14 11:29:36 +10:00
Maikel Linke
98e4f867b4 Provide download link for generated reports 2023-04-14 11:29:35 +10:00
Maikel Linke
ebb15781d5 Store report's filename within the blob 
For future downloads outside the ReportsController.
 2023-04-14 11:29:35 +10:00
Maikel Linke
028c4f4281 Simplify ReportJob by extracting model for result 
This makes the code heaps simpler.
 2023-04-14 11:29:35 +10:00
Maikel Linke
ef7dfa3b4f Store reports with Active Storage 
This will enable us to offer download links and clean them up
automatically.
 2023-04-14 11:29:35 +10:00
Maikel Linke
71f9415d21 Use ApplicationJob as it's a Rails default 2023-04-14 11:29:35 +10:00
Maikel Linke
12848acf21 Fix typo 2023-04-14 11:29:35 +10:00
Maikel Linke
4f751c2711 Leverage test helpers for enqueued jobs 
The production code calls `perform_later` and it's better to do the same
in specs. Handy test helper allow us to control the execution.

Credit to https://github.com/cyrillefr.
 2023-04-14 11:29:35 +10:00
jibees
920e2564a4 Merge pull request #10692 from openfoodfoundation/dependabot/bundler/rubocop-1.50.1 
Bump rubocop from 1.50.0 to 1.50.1
 2023-04-13 13:45:28 +02:00
Jean-Baptiste Bellet
6b4e150e2a Active split_checkout feature by default 2023-04-13 13:21:23 +02:00
dependabot[bot]
2d43e32688 Bump rubocop from 1.50.0 to 1.50.1 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.50.0 to 1.50.1.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.50.0...v1.50.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-13 09:57:38 +00:00
David Cook
a6cd393c57 Update all locales with the latest Transifex translations v4.3.3 2023-04-13 16:45:38 +10:00
Filipe
b1060bf1c9 Merge pull request #10640 from openfoodfoundation/dependabot/bundler/stripe-8.5.0 
Bump stripe from 8.3.0 to 8.5.0
 2023-04-12 19:27:18 +01:00
Filipe
1bf5fbaf3a Merge pull request #10449 from macanudo527/fix_ER 
Update OCs after ER Permissions are Revoked
 2023-04-12 18:59:20 +01:00
Konrad
2ace3afd67 Merge pull request #10606 from thejwuscript/10116-improve-bom-sorting 
Sort orders by last name
 2023-04-12 16:36:45 +02:00
Konrad
0bfceb877d Merge pull request #10666 from jibees/9723-admin-missing-translation-in-payment-report 
Admin, Payment reports: add missing translation for payment state
 2023-04-12 15:47:23 +02:00
Filipe
c1d28b2e8f Merge pull request #10119 from binarygit/donot-hide-producers-name-in-products 
Display producer's name in products inspite of hide all refs option
 2023-04-12 13:07:52 +01:00
Jean-Baptiste Bellet
2841b42296 Specify truncate parameter as we don't always truncate description 
Only when too long.
 2023-04-12 10:34:30 +02:00
jibees
98e44e7a40 Merge pull request #10687 from openfoodfoundation/dependabot/bundler/nokogiri-1.14.3 
Bump nokogiri from 1.14.2 to 1.14.3
 2023-04-12 10:25:56 +02:00