Commit Graph

18014 Commits

Author SHA1 Message Date
dependabot[bot]
38bc78273d Bump kaminari from 1.2.1 to 1.2.2
Bumps [kaminari](https://github.com/kaminari/kaminari) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/kaminari/kaminari/releases)
- [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kaminari/kaminari/compare/v1.2.1...v1.2.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-25 17:54:36 +02:00
Javi Martín
4b6f3b22bb Merge pull request #4932 from consul/dependabot/bundler/master/foundation_rails_helper-4.0.1
Bump foundation_rails_helper from 4.0.0 to 4.0.1
2022-08-25 16:45:17 +02:00
dependabot[bot]
2ff8eac774 Bump foundation_rails_helper from 4.0.0 to 4.0.1
Bumps [foundation_rails_helper](https://github.com/sgruhier/foundation_rails_helper) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/sgruhier/foundation_rails_helper/releases)
- [Changelog](https://github.com/sgruhier/foundation_rails_helper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sgruhier/foundation_rails_helper/commits)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-25 16:19:32 +02:00
Javi Martín
6f7c8ba00a Merge pull request #4935 from consul/dependabot/bundler/master/capybara-3.37.1
Bump capybara from 3.35.3 to 3.37.1
2022-08-25 16:14:16 +02:00
Javi Martín
ffb7d94c36 Merge pull request #4936 from consul/dependabot/bundler/master/capistrano-bundler-2.1.0
Bump capistrano-bundler from 2.0.1 to 2.1.0
2022-08-25 16:05:52 +02:00
dependabot[bot]
019bc52c3f Bump capybara from 3.35.3 to 3.37.1
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.35.3 to 3.37.1.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.35.3...3.37.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-25 15:52:33 +02:00
dependabot[bot]
bbfebaccf9 Bump capistrano-bundler from 2.0.1 to 2.1.0
Bumps [capistrano-bundler](https://github.com/capistrano/bundler) from 2.0.1 to 2.1.0.
- [Release notes](https://github.com/capistrano/bundler/releases)
- [Commits](https://github.com/capistrano/bundler/compare/v2.0.1...v2.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-25 15:48:34 +02:00
Javi Martín
3a7a5b2346 Merge pull request #4920 from consul/budget_results_tests
Fix flaky budget results tests
2022-08-25 15:32:39 +02:00
Javi Martín
610f378079 Merge pull request #4911 from consul/dependabot/bundler/master/rubocop-rails-2.15.2
Bump rubocop-rails from 2.11.3 to 2.15.2
2022-08-25 15:24:06 +02:00
Javi Martín
62b3521a0f Fix flaky budget results test
We were checking that the price of the investment isn't present on the
page. However, the text "200" could be present in either the title of
the budget or the title of the heading ("Heading 200"), for instance. So
now we're making sure we look for the text on the relevant part of the
page.
2022-08-25 15:17:19 +02:00
Javi Martín
dce8400775 Use investment titles in budget results tests
We were getting some failures because sometimes the titles which are
generated automatically (like "Budget Investment 200 title") contained
the price of the investment, and so, when testing the presence of the
price (200, in this case), the test was failing.

So we're adding a custom title to the investments we create during the
tests.
2022-08-25 14:31:51 +02:00
Javi Martín
969e0014e5 Move budget result test to the model
We were testing that the `calculate_winners` method does not take the
price into account; we can do the same in a model test. We already have
a different system test to check that the price isn't displayed in the
view.
2022-08-25 14:31:51 +02:00
Javi Martín
3778b50310 Fix typo in budget results test 2022-08-25 14:31:51 +02:00
Javi Martín
fd147f883a Add extra step in incompatible investments test
The test was always passing because incompatible investments are only
shown after clicking on the "Show all" link. So now we're clicking the
link  before checking the "incompatibles" table isn't shown.

I don't think "incompatibles" is a valid English word; for now, I'm
leaving it like this until a native English speaker reviews it.
2022-08-25 14:31:37 +02:00
Javi Martín
c8270d58bd Add and apply Rails/DurationArithmetic rubocop rule
This rule was added in rubocop-rails 2.13.0. We were already applying it
most of the time.
2022-08-24 23:24:36 +02:00
Javi Martín
68899c80b6 Add Rails/RedundantTravelBack rubocop rule
This rule was added in rubocop-rails 2.12.0. It doesn't catch the case
we've seen the most in the past, though: using `travel_back` to finish
the test will not raise an offense.

However, it does detect a useless `travel_back` call in `after` blocks,
so I guess it's better than nothing.
2022-08-24 23:24:23 +02:00
Javi Martín
fc757428ef Bump rubocop-rails from 2.11.3 to 2.15.2
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.11.3 to 2.15.2.
- [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.11.3...v2.15.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-24 22:11:47 +02:00
Javi Martín
0cb7d5c81e Merge pull request #4909 from consul/dependabot/bundler/master/wicked_pdf-2.6.3
Bump wicked_pdf from 2.1.0 to 2.6.3
2022-08-24 21:54:22 +02:00
dependabot[bot]
57a2566594 Bump wicked_pdf from 2.1.0 to 2.6.3
Bumps [wicked_pdf](https://github.com/mileszs/wicked_pdf) from 2.1.0 to 2.6.3.
- [Release notes](https://github.com/mileszs/wicked_pdf/releases)
- [Changelog](https://github.com/mileszs/wicked_pdf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mileszs/wicked_pdf/compare/2.1.0...2.6.3)

---
updated-dependencies:
- dependency-name: wicked_pdf
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-24 21:35:54 +02:00
Javi Martín
eec34ebd3b Merge pull request #4910 from consul/dependabot/bundler/master/sitemap_generator-6.3.0
Bump sitemap_generator from 6.1.2 to 6.3.0
2022-08-24 21:35:20 +02:00
dependabot[bot]
cb72c00b43 Bump sitemap_generator from 6.1.2 to 6.3.0
Bumps [sitemap_generator](https://github.com/kjvarga/sitemap_generator) from 6.1.2 to 6.3.0.
- [Release notes](https://github.com/kjvarga/sitemap_generator/releases)
- [Changelog](https://github.com/kjvarga/sitemap_generator/blob/master/CHANGES.md)
- [Commits](https://github.com/kjvarga/sitemap_generator/compare/v6.1.2...v6.3.0)

---
updated-dependencies:
- dependency-name: sitemap_generator
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-24 21:19:37 +02:00
Javi Martín
6e0e174df2 Merge pull request #4908 from consul/dependabot/bundler/master/caxlsx-3.2.0
Bump caxlsx from 3.1.0 to 3.2.0
2022-08-24 21:17:44 +02:00
dependabot[bot]
3bd6e6da50 Bump caxlsx from 3.1.0 to 3.2.0
Bumps [caxlsx](https://github.com/caxlsx/caxlsx) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/caxlsx/caxlsx/releases)
- [Changelog](https://github.com/caxlsx/caxlsx/blob/master/CHANGELOG.md)
- [Commits](https://github.com/caxlsx/caxlsx/compare/v3.1.0...v3.2.0)

---
updated-dependencies:
- dependency-name: caxlsx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-24 20:58:56 +02:00
Javi Martín
f620f1a385 Merge pull request #4912 from consul/dependabot/bundler/master/daemons-1.4.1
Bump daemons from 1.4.0 to 1.4.1
2022-08-24 20:56:30 +02:00
Javi Martín
2f71f8f3fc Merge pull request #4913 from consul/dependabot/bundler/master/caxlsx_rails-0.6.3
Bump caxlsx_rails from 0.6.2 to 0.6.3
2022-08-24 20:42:21 +02:00
dependabot[bot]
1149d276e5 Bump daemons from 1.4.0 to 1.4.1
Bumps [daemons](https://github.com/thuehlinger/daemons) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/thuehlinger/daemons/releases)
- [Changelog](https://github.com/thuehlinger/daemons/blob/master/Releases)
- [Commits](https://github.com/thuehlinger/daemons/compare/v1.4.0...v1.4.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-24 20:38:09 +02:00
dependabot[bot]
6a6ad9ee75 Bump caxlsx_rails from 0.6.2 to 0.6.3
Bumps [caxlsx_rails](https://github.com/caxlsx/caxlsx_rails) from 0.6.2 to 0.6.3.
- [Release notes](https://github.com/caxlsx/caxlsx_rails/releases)
- [Changelog](https://github.com/caxlsx/caxlsx_rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/caxlsx/caxlsx_rails/compare/v0.6.2...v0.6.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-24 20:11:46 +02:00
Javi Martín
57b3ec93e5 Merge pull request #4917 from consul/dependabot/bundler/master/capistrano3-puma-5.2.0
Bump capistrano3-puma from 5.0.4 to 5.2.0
2022-08-24 20:09:33 +02:00
Javi Martín
739f23ea54 Merge pull request #4915 from consul/dependabot/bundler/master/capistrano-rails-1.6.2
Bump capistrano-rails from 1.6.1 to 1.6.2
2022-08-24 19:56:45 +02:00
dependabot[bot]
c1a6345f06 Bump capistrano3-puma from 5.0.4 to 5.2.0
Bumps [capistrano3-puma](https://github.com/seuros/capistrano-puma) from 5.0.4 to 5.2.0.
- [Release notes](https://github.com/seuros/capistrano-puma/releases)
- [Changelog](https://github.com/seuros/capistrano-puma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/seuros/capistrano-puma/compare/v5.0.4...v5.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-24 19:45:07 +02:00
Javi Martín
8b745a2389 Merge pull request #4914 from consul/dependabot/bundler/master/sprockets-4.1.1
Bump sprockets from 4.0.2 to 4.1.1
2022-08-24 19:42:21 +02:00
dependabot[bot]
3b8d990ade Bump capistrano-rails from 1.6.1 to 1.6.2
Bumps [capistrano-rails](https://github.com/capistrano/rails) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/capistrano/rails/releases)
- [Commits](https://github.com/capistrano/rails/compare/v1.6.1...v1.6.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-24 19:40:43 +02:00
dependabot[bot]
809fbb3000 Bump sprockets from 4.0.2 to 4.1.1
Bumps [sprockets](https://github.com/rails/sprockets) from 4.0.2 to 4.1.1.
- [Release notes](https://github.com/rails/sprockets/releases)
- [Changelog](https://github.com/rails/sprockets/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rails/sprockets/compare/v4.0.2...v4.1.1)

---
updated-dependencies:
- dependency-name: sprockets
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-24 19:23:08 +02:00
Javi Martín
200e8fb05d Merge pull request #4881 from consul/rails_6.0_methods
Use Rails 6.0 methods to simplify code
2022-08-24 18:35:17 +02:00
Javi Martín
5b844bf231 Use index_with to simplify hash generation
This method was introduced in Rails 6.0. It can be used to take an array
and create a hash where the elements of the array are the indexes of the
hash.
2022-08-24 18:19:02 +02:00
Javi Martín
eca1714a26 Use Rails native attachment validations
They were introduced in Rails 6.0.
2022-08-24 18:11:56 +02:00
Javi Martín
c97e7852a4 Use "excluding" instead of "reject"
This method was already available as #without, but we didn't know about
it.
2022-08-24 18:11:56 +02:00
Javi Martín
b59e2b31d3 Use unfreeze_time instead of travel_back
This is consistent with `with_frozen_time`.
2022-08-24 18:11:56 +02:00
Javi Martín
ea3abd6317 Add and apply Rails/Pick rubocop rule
The `pick` method was added in Rails 6.0.
2022-08-24 18:11:56 +02:00
Javi Martín
480ab6a9da Use truncate_all instead of DatabaseCleaner
Performance tests show both methods of truncating the database take
about the same time, so we can remove one dependency and we don't lose
anything in the process.
2022-08-24 18:11:56 +02:00
Javi Martín
f8ec98c2a6 Merge pull request #4919 from consul/relations_search_spec
Add more expectations in SDG Management search spec
2022-08-24 17:32:29 +02:00
Javi Martín
3d95f762af Add more expectations in SDG Management search spec
We've had some tests fail after this test was executed in our CI, and
one possible reason could be that sometimes this test finished before
all its requests had finished. This could be the case with the following
code:

```
visit sdg_management_proposals_path(filter: "pending_sdg_review")

click_button "Search"

expect(page).to have_css "li.is-active h2", exact_text: "Pending"
```

Before clicking the "Search" button, the expectation is already true, so
there's a chance that the expectation is evaluated as true before the
request has finished. That might result in requests and session data
leaking between tests.

So we're adding more expectations in order to make sure that the
requests have finished before evaluating the expectations associated to
them.
2022-08-24 17:09:12 +02:00
Javi Martín
2bf9433089 Merge pull request #4874 from consul/rails_6.0
Upgrade to Rails 6.0
2022-08-24 16:06:07 +02:00
Javi Martín
790170a27c Use keyword arguments in tag methods
The interface of this method has changed and uses keyword arguments
instead of a hash of options. This change will be particularly
significant when upgrading to Ruby 3.
2022-08-24 15:10:36 +02:00
Javi Martín
0b613158da Update TranslationHelper monkey-patch
The `translate` method now receives keyword arguments instead of a hash
of options.
2022-08-24 14:36:49 +02:00
Javi Martín
4732a6b22d Bump web-console from 3.7.0 to 4.0.4
We were getting a warning after upgrading to Rails 6:

DEPRECATION WARNING: ActionView::Base instances should be constructed
with a lookup context, assignments, and a controller.

We didn't upgrade web-console earlier because version 4.x isn't
compatible with Rails 5.
2022-08-24 14:36:49 +02:00
Javi Martín
a72572eb64 Add image_processing gem dependency
It's now used by default to handle image variants. We were getting a
warning:

DEPRECATION WARNING: Generating image variants will require the
image_processing gem in Rails 6.1. Please add `gem 'image_processing',
'~> 1.2'` to your Gemfile.

Note `mini_magick` is required in order to use the `analyze` method [1].
Since we use it in our image (and site customization image) validations,
we're still keeping the explicit dependency in our Gemfile.

[1] https://guides.rubyonrails.org/v6.0/active_storage_overview.html#analyzing-files
2022-08-24 14:36:49 +02:00
Javi Martín
19da667478 Include default locale in fallbacks explicitly
We were getting a warning because it won't be included by default in
Rails 6.1:

DEPRECATION WARNING: Using I18n fallbacks with an empty `defaults` sets
the defaults to include the `default_locale`. This behavior will change
in Rails 6.1 . If you desire the default locale to be included in the
defaults, please explicitly configure it with
`config.i18n.fallbacks.defaults = [I18n.default_locale]` or
`config.i18n.fallbacks = [I18n.default_locale, {...}]`. If you want to
opt-in to the new behavior, use `config.i18n.fallbacks.defaults = [nil,
{...}] `.
2022-08-24 14:36:49 +02:00
Javi Martín
7c8e3788ec Use new module_parent and module_parents methods
We were getting some deprecation warnings:

DEPRECATION WARNING: `Module#parent` has been renamed to
`module_parent`. `parent` is deprecated and will be removed in Rails
6.1.

DEPRECATION WARNING: `Module#parents` has been renamed to
`module_parents`. `parents` is deprecated and will be removed in Rails
6.1.
2022-08-24 14:36:49 +02:00
Javi Martín
7fe2309762 Use Rails 6.0 defaults and overwrite them
We can remove the `new_framework_defaults_6_0` file by using Rails 6.0
default options and overwriting the ones we haven't enabled.

We're still using the classic autoloader because we still haven't
checked how switching to zeitwerk will affect the way CONSUL
installations customize their code.

And we're using the default queues for Active Storage because we were
already using them and that will be the default option in Rails 6.1.
2022-08-24 14:36:49 +02:00