Add latest changes from gitlab-org/gitlab@master

4 files changed, 9 insertions, 9 deletions

diff --git a/spec/policies/environment_policy_spec.rb b/spec/policies/environment_policy_spec.rb
index 649b1a770c0..701fc7ac9ae 100644
--- a/spec/policies/environment_policy_spec.rb
+++ b/spec/policies/environment_policy_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe EnvironmentPolicy do
 
         with_them do
           before do
-            project.add_user(user, access_level) unless access_level.nil?
+            project.add_member(user, access_level) unless access_level.nil?
           end
 
           it { expect(policy.allowed?(:stop_environment)).to be allowed? }
@@ -49,7 +49,7 @@ RSpec.describe EnvironmentPolicy do
         context 'with protected branch' do
           with_them do
             before do
-              project.add_user(user, access_level) unless access_level.nil?
+              project.add_member(user, access_level) unless access_level.nil?
               create(:protected_branch, :no_one_can_push,
                      name: 'master', project: project)
             end
@@ -86,7 +86,7 @@ RSpec.describe EnvironmentPolicy do
 
         with_them do
           before do
-            project.add_user(user, access_level) unless access_level.nil?
+            project.add_member(user, access_level) unless access_level.nil?
           end
 
           it { expect(policy.allowed?(:stop_environment)).to be allowed? }
@@ -120,7 +120,7 @@ RSpec.describe EnvironmentPolicy do
 
         with_them do
           before do
-            project.add_user(user, access_level) unless access_level.nil?
+            project.add_member(user, access_level) unless access_level.nil?
           end
 
           it { expect(policy).to be_disallowed :destroy_environment }
diff --git a/spec/policies/namespace/root_storage_statistics_policy_spec.rb b/spec/policies/namespace/root_storage_statistics_policy_spec.rb
index e6b58bca4a8..89875f83c9b 100644
--- a/spec/policies/namespace/root_storage_statistics_policy_spec.rb
+++ b/spec/policies/namespace/root_storage_statistics_policy_spec.rb
@@ -59,7 +59,7 @@ RSpec.describe Namespace::RootStorageStatisticsPolicy do
 
         with_them do
           before do
-            group.add_user(user, user_type) unless user_type == :non_member
+            group.add_member(user, user_type) unless user_type == :non_member
           end
 
           it { is_expected.to eq(outcome) }
diff --git a/spec/policies/project_policy_spec.rb b/spec/policies/project_policy_spec.rb
index 5884dc3f23f..de36b755e88 100644
--- a/spec/policies/project_policy_spec.rb
+++ b/spec/policies/project_policy_spec.rb
@@ -1736,7 +1736,7 @@ RSpec.describe ProjectPolicy do
           %w(guest reporter developer maintainer).each do |role|
             context role do
               before do
-                project.add_user(current_user, role.to_sym)
+                project.add_member(current_user, role.to_sym)
               end
 
               if role == 'guest'
@@ -1770,7 +1770,7 @@ RSpec.describe ProjectPolicy do
           %w(guest reporter developer maintainer).each do |role|
             context role do
               before do
-                project.add_user(current_user, role.to_sym)
+                project.add_member(current_user, role.to_sym)
               end
 
               it { is_expected.to be_allowed(:read_ci_cd_analytics) }
@@ -1800,7 +1800,7 @@ RSpec.describe ProjectPolicy do
         %w(guest reporter developer maintainer).each do |role|
           context role do
             before do
-              project.add_user(current_user, role.to_sym)
+              project.add_member(current_user, role.to_sym)
             end
 
             if role == 'guest'
diff --git a/spec/policies/project_statistics_policy_spec.rb b/spec/policies/project_statistics_policy_spec.rb
index 74630dc38ad..56e6161a264 100644
--- a/spec/policies/project_statistics_policy_spec.rb
+++ b/spec/policies/project_statistics_policy_spec.rb
@@ -72,7 +72,7 @@ RSpec.describe ProjectStatisticsPolicy do
 
         before do
           unless [:unauthenticated, :non_member].include?(user_type)
-            project.add_user(external, user_type)
+            project.add_member(external, user_type)
           end
         end