Merge branch 'ee-enable-a-few-rubocop-rspec-cops' into 'master'

[EE] Disable RSpec/BeforeAfterAll and enable RSpec/ImplicitExpect cops

See merge request !2305

.rubocop.yml

@@ -967,6 +967,10 @@ RSpec/AnyInstance:
 RSpec/BeEql:
   Enabled: true
 
+# We don't enforce this as we use this technique in a few places.
+RSpec/BeforeAfterAll:
+  Enabled: false
+
 # Check that the first argument to the top level describe is the tested class or
 # module.
 RSpec/DescribeClass:
@@ -1029,6 +1033,12 @@ RSpec/FilePath:
 RSpec/Focus:
   Enabled: true
 
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: is_expected, should
+RSpec/ImplicitExpect:
+  Enabled: true
+  EnforcedStyle: is_expected
+
 # Checks for the usage of instance variables.
 RSpec/InstanceVariable:
   Enabled: false

.rubocop_todo.yml

@@ -6,10 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 54
-RSpec/BeforeAfterAll:
-  Enabled: false
-
 # Offense count: 233
 RSpec/EmptyLineAfterFinalLet:
   Enabled: false
@@ -24,12 +20,6 @@ RSpec/EmptyLineAfterSubject:
 RSpec/HookArgument:
   Enabled: false
 
-# Offense count: 12
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: is_expected, should
-RSpec/ImplicitExpect:
-  Enabled: false
-
 # Offense count: 11
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: it_behaves_like, it_should_behave_like

spec/mailers/notify_spec.rb

@@ -1357,16 +1357,16 @@ describe Notify do
     end
 
     it 'is sent to recipient' do
-      should deliver_to user.email
+      is_expected.to deliver_to user.email
     end
 
     it 'has the correct subject' do
-      should have_subject 'Admin announcement'
+      is_expected.to have_subject 'Admin announcement'
     end
 
     it 'includes unsubscribe link' do
       unsubscribe_link = "http://localhost/unsubscribes/#{Base64.urlsafe_encode64(user.email)}"
-      should have_body_text(unsubscribe_link)
+      is_expected.to have_body_text(unsubscribe_link)
     end
   end
 

spec/models/approval_spec.rb

@@ -3,5 +3,5 @@ require 'spec_helper'
 describe Approval do
   subject { create(:approval) }
 
-  it { should be_valid }
+  it { is_expected.to be_valid }
 end

spec/models/approver_group_spec.rb

@@ -3,5 +3,5 @@ require 'spec_helper'
 describe ApproverGroup do
   subject { create(:approver_group) }
 
-  it { should be_valid }
+  it { is_expected.to be_valid }
 end

spec/models/project_group_link_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe ProjectGroupLink do
   describe "Associations" do
-    it { should belong_to(:group) }
-    it { should belong_to(:project) }
+    it { is_expected.to belong_to(:group) }
+    it { is_expected.to belong_to(:project) }
   end
 
   describe "Validation" do
@@ -12,10 +12,10 @@ describe ProjectGroupLink do
     let(:project) { create(:project, group: group) }
     let!(:project_group_link) { create(:project_group_link, project: project) }
 
-    it { should validate_presence_of(:project_id) }
-    it { should validate_uniqueness_of(:group_id).scoped_to(:project_id).with_message(/already shared/) }
-    it { should validate_presence_of(:group) }
-    it { should validate_presence_of(:group_access) }
+    it { is_expected.to validate_presence_of(:project_id) }
+    it { is_expected.to validate_uniqueness_of(:group_id).scoped_to(:project_id).with_message(/already shared/) }
+    it { is_expected.to validate_presence_of(:group) }
+    it { is_expected.to validate_presence_of(:group_access) }
 
     it "doesn't allow a project to be shared with the group it is in" do
       project_group_link.group = group

spec/models/project_services/external_wiki_service_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe ExternalWikiService, models: true do
   include ExternalWikiHelper
   describe "Associations" do
-    it { should belong_to :project }
-    it { should have_one :service_hook }
+    it { is_expected.to belong_to :project }
+    it { is_expected.to have_one :service_hook }
   end
 
   describe 'Validations' do

spec/models/project_spec.rb

@@ -997,7 +997,7 @@ describe Project, models: true do
           allow(Gitlab::Geo).to receive_message_chain(:primary_node, :url) { geo_url }
         end
 
-        it { should eq "#{geo_url}#{avatar_path}" }
+        it { is_expected.to eq "#{geo_url}#{avatar_path}" }
       end
     end
 
@@ -1008,13 +1008,13 @@ describe Project, models: true do
 
       let(:avatar_path) { "/#{project.full_path}/avatar" }
 
-      it { should eq "http://#{Gitlab.config.gitlab.host}#{avatar_path}" }
+      it { is_expected.to eq "http://#{Gitlab.config.gitlab.host}#{avatar_path}" }
     end
 
     context 'when git repo is empty' do
       let(:project) { create(:empty_project) }
 
-      it { should eq nil }
+      it { is_expected.to eq nil }
     end
   end
 

spec/models/push_rule_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe PushRule do
   describe "Associations" do
-    it { should belong_to(:project) }
+    it { is_expected.to belong_to(:project) }
   end
 
   describe "Validation" do
-    it { should validate_presence_of(:project) }
-    it { should validate_numericality_of(:max_file_size).is_greater_than_or_equal_to(0).only_integer }
+    it { is_expected.to validate_presence_of(:project) }
+    it { is_expected.to validate_numericality_of(:max_file_size).is_greater_than_or_equal_to(0).only_integer }
   end
 end