raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-03 02:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,421 Commits 18 Branches 455 Tags
cbdb3c28341a25bd256a91ab5db304beff319647
Commit Graph

26421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jibees
cbdb3c2834 Merge pull request #10504 from openfoodfoundation/dependabot/bundler/rubocop-1.47.0 
Bump rubocop from 1.46.0 to 1.47.0
 2023-03-02 11:12:46 +01:00
dependabot[bot]
87c3165a24 Bump rubocop from 1.46.0 to 1.47.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.46.0 to 1.47.0.
- [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.46.0...v1.47.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-02 10:02:09 +00:00
jibees
e7bf912a23 Merge pull request #10490 from openfoodfoundation/dependabot/bundler/puma-6.1.1 
Bump puma from 6.1.0 to 6.1.1
 2023-03-01 15:14:57 +01:00
jibees
b07a0fca50 Merge pull request #10498 from openfoodfoundation/dependabot/bundler/knapsack_pro-3.8.0 
Bump knapsack_pro from 3.7.0 to 3.8.0
 2023-03-01 11:01:37 +01:00
dependabot[bot]
d146684acb Bump knapsack_pro from 3.7.0 to 3.8.0 
Bumps [knapsack_pro](https://github.com/KnapsackPro/knapsack_pro-ruby) from 3.7.0 to 3.8.0.
- [Release notes](https://github.com/KnapsackPro/knapsack_pro-ruby/releases)
- [Changelog](https://github.com/KnapsackPro/knapsack_pro-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v3.7.0...v3.8.0)

---
updated-dependencies:
- dependency-name: knapsack_pro
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-01 09:13:38 +00:00
Maikel
c3fe399f0c Merge pull request #10476 from mkllnk/flaky-index-spec 
Stabilise flaky spec with defined enterprise order
 2023-03-01 10:05:44 +11:00
Maikel
182e5bd0ee Merge pull request #10493 from jibees/10492-background-reports-background_reports-breaks-pdf-and-xlsx-file-download 
Reports, `background_reports` feature toggle activated: Force writing file in binary mode
 2023-03-01 10:00:11 +11:00
Maikel
bccee0698f Merge pull request #10332 from jibees/8901-allow-product-description-to-show-images-in-the-shopfront 
Shopfront: Allow product description with formatting and `<img />`
 2023-03-01 09:56:41 +11:00
Konrad
11928859bc Merge pull request #10438 from jibees/10133-update-column-dropdown-everywhere 
Redesign old columns dropdown component to match the design of the new one
 2023-02-28 20:22:00 +01:00
Konrad
6a0b9cbb76 Merge pull request #10459 from openfoodfoundation/dependabot/bundler/stripe-8.3.0 
Bump stripe from 8.0.0 to 8.3.0
 2023-02-28 19:22:50 +01:00
Jean-Baptiste Bellet
075e295fc2 Force writing file in binary mode 
```
/Users/jibees/dev/openfoodnetwork/app/jobs/report_job.rb:22:in `write': "\\xFE" from ASCII-8BIT to UTF-8 (Encoding::UndefinedConversionError)
from /Users/jibees/dev/openfoodnetwork/app/jobs/report_job.rb:22:in `write'
from /Users/jibees/dev/openfoodnetwork/app/jobs/report_job.rb:8:in `perform'
```
 2023-02-28 15:30:14 +01:00
jibees
151f96f673 Merge pull request #10486 from mkllnk/i18n-spec 
Remove unused Spree translation checker
 2023-02-28 14:28:39 +01:00
dependabot[bot]
5cded5ba8d Bump puma from 6.1.0 to 6.1.1 
Bumps [puma](https://github.com/puma/puma) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.1.0...v6.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-28 09:57:59 +00:00
Maikel Linke
4f15b5a65b Specify raised error in spec and avoid warning 
Before it said:

```
WARNING: Using the `raise_error` matcher without providing a specific error or message risks false positives, since `raise_error` will match when Ruby raises a `NoMethodError`, `NameError` or `ArgumentError`, potentially allowing the expectation to pass without even executing the method you are intending to call. Actual error raised was #<RuntimeError: Cannot use t(".legacy_translation") shortcut because path is not available>. Instead consider providing a specific error class or message. This message can be suppressed by setting: `RSpec::Expectations.configuration.on_potential_false_positives = :nothing`.
```
 2023-02-28 15:44:18 +11:00
Maikel Linke
bf1cbe615f Remove unused Spree translation checker 
If we wanted similar functionality in the future then we would implement
it differently. At the moment, it's just unused code.
 2023-02-28 15:44:18 +11:00
Maikel
890ab6796e Merge pull request #10413 from mkllnk/reports-params 
Fix background processing of Enterprise Fee Summary report
 2023-02-28 13:07:59 +11:00
Maikel Linke
10aa7730e5 Rename user var again for clarity 2023-02-28 12:50:55 +11:00
Maikel Linke
116e844004 Stabilise flaky spec with defined enterprise order 2023-02-28 12:42:55 +11:00
Maikel Linke
16289a62f1 Rename test vars for clarity 2023-02-28 12:42:55 +11:00
Maikel Linke
e9fa360d61 Take test setup as granted and simplify 2023-02-28 12:42:55 +11:00
Maikel Linke
e6eb9412d9 Simplify owner selection in spec 
Instead of knowing the input id generated by select2, we now rely on the
fact that the owner is in the fifth column. Both could change but this
is less code.
 2023-02-28 12:42:55 +11:00
Maikel Linke
401210ef44 DRY and clarify test case 2023-02-28 12:42:55 +11:00
Maikel Linke
f484518ee5 Remove unused test enterprise 2023-02-28 12:42:55 +11:00
jibees
165fb59f64 Merge pull request #10482 from anansilva/10044-fix-activemodel-errors-deprecation-warning 
Fix deprecation warning when accessing model errors
 2023-02-27 17:29:33 +01:00
Filipe
42bc9d7f82 Merge pull request #10477 from mkllnk/js-specs 
Remove old test setup code of feature specs
 2023-02-27 15:54:40 +00:00
jibees
f8dce4053a Merge pull request #10473 from openfoodfoundation/dependabot/bundler/rubocop-1.46.0 
Bump rubocop from 1.45.1 to 1.46.0
 2023-02-27 15:36:53 +01:00
dependabot[bot]
c93945a111 Bump rubocop from 1.45.1 to 1.46.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.45.1 to 1.46.0.
- [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.45.1...v1.46.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-27 14:26:22 +00:00
jibees
30b2f9164e Merge pull request #10484 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.18.0 
Bump rubocop-rails from 2.17.4 to 2.18.0
 2023-02-27 15:21:54 +01:00
dependabot[bot]
f355f1ccfb Bump rubocop-rails from 2.17.4 to 2.18.0 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.17.4 to 2.18.0.
- [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.17.4...v2.18.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-27 09:57:28 +00:00
Jean-Baptiste Bellet
166e2f525e New design uses lowercase for component title 
and specify clicking inside the dropdown
 2023-02-27 09:56:48 +01:00
Ana Nunes da Silva
d70c34fbd0 fix deprecation warning when accessing model errors 2023-02-26 21:04:16 +00:00
Konrad
27630a4304 Merge pull request #10442 from mkllnk/enterprise-fee-summary-report 
Report deleted fees in Enterprise Fee Summary
 2023-02-26 19:28:01 +01:00
Maikel Linke
953ff2bd08 Remove more unused spec helpers 2023-02-24 15:31:18 +11:00
Maikel Linke
d7fa508b60 Remove unused matcher have_flash_message 2023-02-24 15:19:54 +11:00
Maikel Linke
815cef16cc Remove browser test config from unit tests 
Mailer specs still use Capybara but they don't use Javascript and don't
need this config.
 2023-02-24 15:17:49 +11:00
Maikel Linke
3d5584e47c Update outdated comment 2023-02-24 15:10:46 +11:00
Maikel Linke
cb64361096 Remove old feature spec tag 
Nowadays all system specs are run in a real browser.
 2023-02-24 15:10:19 +11:00
Maikel Linke
bba41177b4 Remove old test setup code of feature specs 
The `js: true` tag was only used in feature specs. Some system specs
still contain that tag but they don't require this file. So it's dead
code.
 2023-02-24 15:04:03 +11:00
Maikel Linke
800ccf5037 Remove unused method 2023-02-24 10:40:09 +11:00
Maikel Linke
8c7b4f73f7 Detect transaction fee even if fee name is missing 
The Enterprise Fee Summary report is not always providing a fee name.
While that may be a bug on its own, we handle that gracefully now.
 2023-02-24 10:40:09 +11:00
Maikel Linke
8b0c4ee0ac Add unit test for failing Enterprise Fee Summary 
I observed this data but I'm unsure about the root cause. It could be
that the SQL query fetching this data needs tweaking to return the fee
name in this case or it could be that it's not available (deleted).

In any case, I thought I document what's happening and make this
summarizer more robust before looking into the query.
 2023-02-24 10:40:09 +11:00
Filipe
3ffe39d467 Merge pull request #10448 from vviekk/viv/10009 
Fixing Enterprise creation submit button behavior
 2023-02-23 16:00:53 +00:00
vviekk
956ed826a1 Adding test 2023-02-23 20:02:02 +05:30
David Cook
06d370a8ac Update all locales with the latest Transifex translations v4.2.36 2023-02-23 13:00:36 +11:00
David Cook
013533f7de Merge pull request #10397 from openfoodfoundation/dependabot/bundler/roo-2.10.0 
Bump roo from 2.9.0 to 2.10.0
 2023-02-23 10:53:50 +11:00
David Cook
d199dea5eb Style fix: Layout/EmptyLines 2023-02-23 10:12:06 +11:00
David Cook
084211f52a Add comments 2023-02-23 10:10:32 +11:00
Filipe
604fd75cff Merge pull request #10247 from abdellani/sales_tax_totals_by_order 
sales tax totals by order report
 2023-02-22 20:03:45 +00:00
Konrad
8b89c8d7e0 Merge pull request #10451 from cyrillefr/Sort-properly-date-chronologically-and-not-lexicographically 
Sort correctly in Bulk Order Managment
 2023-02-22 14:39:03 +01:00
cyrillefr
e4845f4165 Add a spec for sorting in Bulk Order management 2023-02-20 21:43:05 +01:00