Merge branch 'ee-42385-enable-the-rspec-singlelinehook-cop' into 'master'

[EE]  Resolve "Re-enable the `RSpec/SingleLineHook` cop"

See merge request gitlab-org/gitlab-ee!4248

.rubocop_todo.yml

@@ -342,10 +342,6 @@ RSpec/SharedContext:
   Exclude:
     - 'spec/features/admin/admin_groups_spec.rb'
 
-# Offense count: 90
-RSpec/SingleLineHook:
-  Enabled: false
-
 # Offense count: 5
 RSpec/VoidExpect:
   Exclude:

Gemfile.lock

@@ -329,7 +329,7 @@ GEM
       posix-spawn (~> 0.3)
     gitlab-license (1.0.0)
     gitlab-markup (1.6.3)
-    gitlab-styles (2.3.0)
+    gitlab-styles (2.3.1)
       rubocop (~> 0.51)
       rubocop-gitlab-security (~> 0.1.0)
       rubocop-rspec (~> 1.19)

spec/ee/spec/models/geo_node_status_spec.rb

@@ -474,7 +474,9 @@ describe GeoNodeStatus, :geo do
   end
 
   describe '#storage_shards_match?' do
-    before { stub_primary_node }
+    before do
+      stub_primary_node
+    end
 
     set(:status) { create(:geo_node_status) }
     let(:data) { GeoNodeStatusSerializer.new.represent(status).as_json }

spec/lib/api/entities/geo_node_status_spec.rb

@@ -9,7 +9,9 @@ describe API::Entities::GeoNodeStatus, :postgresql do
 
   subject { entity.as_json }
 
-  before { stub_primary_node }
+  before do
+    stub_primary_node
+  end
 
   describe '#healthy' do
     context 'when node is healthy' do
@@ -127,7 +129,9 @@ describe API::Entities::GeoNodeStatus, :postgresql do
   end
 
   context 'secondary Geo node' do
-    before { stub_secondary_node }
+    before do
+      stub_secondary_node
+    end
 
     it { is_expected.to have_key(:storage_shards) }
     it { is_expected.not_to have_key(:storage_shards_match) }