Merge pull request #4296 from DFE-Digital/fix-rubocop-namespace

Rubocop changes

.rubocop.yml

@@ -1,6 +1,7 @@
 require:
   - rubocop-rails
   - rubocop-rspec
+  - rubocop-rspec_rails
   - rubocop-capybara
   - rubocop-factory_bot
 

Gemfile

@@ -179,6 +179,7 @@ group :development, :test do
   gem 'rubocop-factory_bot'
   gem 'rubocop-rails'
   gem 'rubocop-rspec'
+  gem 'rubocop-rspec_rails'
 
   # run specs in parallel
   gem 'parallel_tests'

Gemfile.lock

@@ -655,6 +655,9 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rspec (3.0.1)
       rubocop (~> 1.61)
+    rubocop-rspec_rails (2.30.0)
+      rubocop (~> 1.61)
+      rubocop-rspec (~> 3, >= 3.0.1)
     ruby-graphviz (1.2.5)
       rexml
     ruby-progressbar (1.13.0)
@@ -858,6 +861,7 @@ DEPENDENCIES
   rubocop-factory_bot
   rubocop-rails
   rubocop-rspec
+  rubocop-rspec_rails
   rubypants
   schema_to_scaffold
   sentry-rails

config/rubocop/naming.yml

@@ -13,12 +13,9 @@ Naming/MethodName:
   Exclude:
     - 'app/models/accrediting_provider_enrichment.rb'
 
+# Allow numbers in variable names
 Naming/VariableNumber:
-  Exclude:
-    - 'app/serializers/api/public/v1/serializable_location.rb'
-    - 'app/serializers/api/public/v1/serializable_provider.rb'
-    - 'spec/serializers/api/public/v1/serializable_location_spec.rb'
-    - 'spec/serializers/api/public/v1/serializable_provider_spec.rb'
+  Enabled: false
 
 Naming/PredicateName:
   Exclude:

config/rubocop/rspec.yml

@@ -1,7 +1,5 @@
 # https://docs.rubocop.org/rubocop-rspec/cops_rspec.html
 
-require: rubocop-rspec
-
 RSpec/ExampleLength:
   Enabled: false
 
@@ -207,8 +205,19 @@ RSpec/InstanceVariable:
 RSpec/PredicateMatcher:
   Enabled: false
 
+RSpecRails/HaveHttpStatus:
+  Exclude:
+    - 'spec/smoke/api/v1/courses_spec.rb'
+    - 'spec/smoke/api/v1/healthcheck_spec.rb'
+    - 'spec/smoke/api/v1/providers_spec.rb'
+
 RSpec/DescribeClass:
   Enabled: false
 
 RSpec/NamedSubject:
   Enabled: false
+
+RSpec/Dialect:
+  PreferredMethods:
+    - "scenario"
+    - "feature"