From 126f7bfb97a317a784bf3f10cda6a44f91f4c7a1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 4 Mar 2021 15:11:45 +0000
Subject: [PATCH 1/2] Bump rubocop-rspec from 1.41.0 to 1.44.1

Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.41.0 to 1.44.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.41.0...v1.44.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 609722480..7dae10e44 100644
--- a/Gemfile
+++ b/Gemfile
@@ -110,7 +110,7 @@ group :development do
   gem "rubocop", "~> 0.91.0", require: false
   gem "rubocop-performance", "~> 1.7.1", require: false
   gem "rubocop-rails", "~> 2.6.0", require: false
-  gem "rubocop-rspec", "~> 1.41.0", require: false
+  gem "rubocop-rspec", "~> 1.44.1", require: false
   gem "rvm1-capistrano3", "~> 1.4.0", require: false
   gem "scss_lint", "~> 0.59.0", require: false
   gem "web-console", "~> 3.7.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 44be7a282..851473d3b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -559,8 +559,9 @@ GEM
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 0.82.0)
-    rubocop-rspec (1.41.0)
-      rubocop (>= 0.68.1)
+    rubocop-rspec (1.44.1)
+      rubocop (~> 0.87)
+      rubocop-ast (>= 0.7.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.0)
@@ -772,7 +773,7 @@ DEPENDENCIES
   rubocop (~> 0.91.0)
   rubocop-performance (~> 1.7.1)
   rubocop-rails (~> 2.6.0)
-  rubocop-rspec (~> 1.41.0)
+  rubocop-rspec (~> 1.44.1)
   rvm1-capistrano3 (~> 1.4.0)
   sassc-rails (~> 2.1.2)
   savon (~> 2.12.1)

From 535a039a3152ab181d6dbc3e2ca57a37ce9c04a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Mon, 9 Aug 2021 16:43:33 +0200
Subject: [PATCH 2/2] Add and apply RSpec/FilePath rubocop rule

This way we make sure editors which support navigating between one class
and its test file can find the alternative files.
---
 .rubocop.yml                                                   | 3 +++
 .../budgets/{ballots => ballot}/lines_controller_spec.rb       | 0
 ...ntroller_spec.rb => remote_translations_controller_spec.rb} | 0
 .../sdg/{goals_spec.rb => goals_controller_spec.rb}            | 0
 .../{relations_spec.rb => relations_controller_spec.rb}        | 0
 .../{achievements_spec.rb => achievements_controller_spec.rb}  | 0
 .../dashboard/{supports_spec.rb => group_supports_spec.rb}     | 0
 7 files changed, 3 insertions(+)
 rename spec/controllers/budgets/{ballots => ballot}/lines_controller_spec.rb (100%)
 rename spec/controllers/{remote_translation_controller_spec.rb => remote_translations_controller_spec.rb} (100%)
 rename spec/controllers/sdg/{goals_spec.rb => goals_controller_spec.rb} (100%)
 rename spec/controllers/sdg_management/{relations_spec.rb => relations_controller_spec.rb} (100%)
 rename spec/requests/dashboard/{achievements_spec.rb => achievements_controller_spec.rb} (100%)
 rename spec/requests/dashboard/{supports_spec.rb => group_supports_spec.rb} (100%)

diff --git a/.rubocop.yml b/.rubocop.yml
index ef3be1d85..8c19663df 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -351,6 +351,9 @@ RSpec/EmptyLineAfterExampleGroup:
 RSpec/ExampleWording:
   Enabled: true
 
+RSpec/FilePath:
+  Enabled: true
+
 RSpec/Focus:
   Enabled: true
 
diff --git a/spec/controllers/budgets/ballots/lines_controller_spec.rb b/spec/controllers/budgets/ballot/lines_controller_spec.rb
similarity index 100%
rename from spec/controllers/budgets/ballots/lines_controller_spec.rb
rename to spec/controllers/budgets/ballot/lines_controller_spec.rb
diff --git a/spec/controllers/remote_translation_controller_spec.rb b/spec/controllers/remote_translations_controller_spec.rb
similarity index 100%
rename from spec/controllers/remote_translation_controller_spec.rb
rename to spec/controllers/remote_translations_controller_spec.rb
diff --git a/spec/controllers/sdg/goals_spec.rb b/spec/controllers/sdg/goals_controller_spec.rb
similarity index 100%
rename from spec/controllers/sdg/goals_spec.rb
rename to spec/controllers/sdg/goals_controller_spec.rb
diff --git a/spec/controllers/sdg_management/relations_spec.rb b/spec/controllers/sdg_management/relations_controller_spec.rb
similarity index 100%
rename from spec/controllers/sdg_management/relations_spec.rb
rename to spec/controllers/sdg_management/relations_controller_spec.rb
diff --git a/spec/requests/dashboard/achievements_spec.rb b/spec/requests/dashboard/achievements_controller_spec.rb
similarity index 100%
rename from spec/requests/dashboard/achievements_spec.rb
rename to spec/requests/dashboard/achievements_controller_spec.rb
diff --git a/spec/requests/dashboard/supports_spec.rb b/spec/requests/dashboard/group_supports_spec.rb
similarity index 100%
rename from spec/requests/dashboard/supports_spec.rb
rename to spec/requests/dashboard/group_supports_spec.rb