Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 19 deletions

diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml
index 56a28004233..0715e56c130 100644
--- a/spec/support/rspec_order_todo.yml
+++ b/spec/support/rspec_order_todo.yml
@@ -1691,7 +1691,7 @@
 - './ee/spec/models/gitlab_subscription_spec.rb'
 - './ee/spec/models/gitlab_subscriptions/upcoming_reconciliation_spec.rb'
 - './ee/spec/models/group_deletion_schedule_spec.rb'
-- './ee/spec/models/group_member_spec.rb'
+- './ee/spec/models/ee/group_member_spec.rb'
 - './ee/spec/models/group_merge_request_approval_setting_spec.rb'
 - './ee/spec/models/groups/repository_storage_move_spec.rb'
 - './ee/spec/models/group_wiki_repository_spec.rb'
@@ -1715,7 +1715,7 @@
 - './ee/spec/models/label_note_spec.rb'
 - './ee/spec/models/ldap_group_link_spec.rb'
 - './ee/spec/models/license_spec.rb'
-- './ee/spec/models/member_spec.rb'
+- './ee/spec/models/ee/member_spec.rb'
 - './ee/spec/models/merge_request/blocking_spec.rb'
 - './ee/spec/models/merge_request_block_spec.rb'
 - './ee/spec/models/merge_requests/compliance_violation_spec.rb'
@@ -1740,7 +1740,7 @@
 - './ee/spec/models/project_feature_spec.rb'
 - './ee/spec/models/project_import_data_spec.rb'
 - './ee/spec/models/project_import_state_spec.rb'
-- './ee/spec/models/project_member_spec.rb'
+- './ee/spec/models/ee/project_member_spec.rb'
 - './ee/spec/models/project_repository_state_spec.rb'
 - './ee/spec/models/project_security_setting_spec.rb'
 - './ee/spec/models/protected_branch/required_code_owners_section_spec.rb'
diff --git a/spec/support/shared_examples/models/members_notifications_shared_example.rb b/spec/support/shared_examples/models/members_notifications_shared_example.rb
index 5c783b5cfa7..17dc927f3cc 100644
--- a/spec/support/shared_examples/models/members_notifications_shared_example.rb
+++ b/spec/support/shared_examples/models/members_notifications_shared_example.rb
@@ -19,22 +19,6 @@ RSpec.shared_examples 'members notifications' do |entity_type|
     end
   end
 
-  describe "#after_update" do
-    let(:member) { create(:"#{entity_type}_member", :developer) }
-
-    it "calls NotificationService.update_#{entity_type}_member" do
-      expect(notification_service).to receive(:"update_#{entity_type}_member").with(member)
-
-      member.update_attribute(:access_level, Member::MAINTAINER)
-    end
-
-    it "does not send an email when the access level has not changed" do
-      expect(notification_service).not_to receive(:"update_#{entity_type}_member")
-
-      member.touch
-    end
-  end
-
   describe '#after_commit' do
     context 'on creation of a member requesting access' do
       let(:member) do