Resolve "Rename the `Master` role to `Maintainer`" Backend

7 files changed, 9 insertions, 9 deletions

diff --git a/spec/features/groups/activity_spec.rb b/spec/features/groups/activity_spec.rb
index 27520cf0e22..88fc12ae1e4 100644
--- a/spec/features/groups/activity_spec.rb
+++ b/spec/features/groups/activity_spec.rb
@@ -23,7 +23,7 @@ describe 'Group activity page' do
       let(:project) { create(:project, :public, namespace: group) }
 
       before do
-        project.add_master(user)
+        project.add_maintainer(user)
 
         visit path
       end
diff --git a/spec/features/groups/empty_states_spec.rb b/spec/features/groups/empty_states_spec.rb
index dd901b034f7..8f5ca781b2c 100644
--- a/spec/features/groups/empty_states_spec.rb
+++ b/spec/features/groups/empty_states_spec.rb
@@ -19,7 +19,7 @@ describe 'Group empty states' do
         let(:project) { create(:project, namespace: group) }
 
         before do
-          project.add_master(user)
+          project.add_maintainer(user)
         end
 
         context "the project has #{issuable_name}s" do
diff --git a/spec/features/groups/issues_spec.rb b/spec/features/groups/issues_spec.rb
index 2bab6aa3d48..97d8776b15a 100644
--- a/spec/features/groups/issues_spec.rb
+++ b/spec/features/groups/issues_spec.rb
@@ -80,10 +80,10 @@ describe 'Group issues page' do
 
   context 'projects with issues disabled' do
     describe 'issue dropdown' do
-      let(:user_in_group) { create(:group_member, :master, user: create(:user), group: group ).user }
+      let(:user_in_group) { create(:group_member, :maintainer, user: create(:user), group: group ).user }
 
       before do
-        [project, project_with_issues_disabled].each { |project| project.add_master(user_in_group) }
+        [project, project_with_issues_disabled].each { |project| project.add_maintainer(user_in_group) }
         sign_in(user_in_group)
         visit issues_group_path(group)
       end
diff --git a/spec/features/groups/members/filter_members_spec.rb b/spec/features/groups/members/filter_members_spec.rb
index 8b4f6dbcc50..386d81546d7 100644
--- a/spec/features/groups/members/filter_members_spec.rb
+++ b/spec/features/groups/members/filter_members_spec.rb
@@ -7,7 +7,7 @@ describe 'Groups > Members > Filter members' do
 
   before do
     group.add_owner(user)
-    group.add_master(user_with_2fa)
+    group.add_maintainer(user_with_2fa)
 
     sign_in(user)
   end
diff --git a/spec/features/groups/members/master_manages_access_requests_spec.rb b/spec/features/groups/members/master_manages_access_requests_spec.rb
index 4fdf1497781..bd615c99412 100644
--- a/spec/features/groups/members/master_manages_access_requests_spec.rb
+++ b/spec/features/groups/members/master_manages_access_requests_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe 'Groups > Members > Master manages access requests' do
-  it_behaves_like 'Master manages access requests' do
+describe 'Groups > Members > Maintainer manages access requests' do
+  it_behaves_like 'Maintainer manages access requests' do
     let(:entity) { create(:group, :public, :access_requestable) }
     let(:members_page_path) { group_group_members_path(entity) }
   end
diff --git a/spec/features/groups/milestone_spec.rb b/spec/features/groups/milestone_spec.rb
index 5ab03cb6ee6..80df0618a6a 100644
--- a/spec/features/groups/milestone_spec.rb
+++ b/spec/features/groups/milestone_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 describe 'Group milestones' do
   let(:group) { create(:group) }
   let!(:project) { create(:project_empty_repo, group: group) }
-  let(:user) { create(:group_member, :master, user: create(:user), group: group ).user }
+  let(:user) { create(:group_member, :maintainer, user: create(:user), group: group ).user }
 
   around do |example|
     Timecop.freeze { example.run }
diff --git a/spec/features/groups/milestones_sorting_spec.rb b/spec/features/groups/milestones_sorting_spec.rb
index 5deb55bc8bb..bc226ff41c1 100644
--- a/spec/features/groups/milestones_sorting_spec.rb
+++ b/spec/features/groups/milestones_sorting_spec.rb
@@ -9,7 +9,7 @@ describe 'Milestones sorting', :js do
   let!(:project_milestone2) { create(:milestone, project: project, title: 'v2.0', due_date: 5.days.from_now) }
   let!(:other_project_milestone2) { create(:milestone, project: other_project, title: 'v2.0', due_date: 5.days.from_now) }
   let!(:group_milestone) { create(:milestone, group: group, title: 'v3.0', due_date: 7.days.from_now) }
-  let(:user) { create(:group_member, :master, user: create(:user), group: group ).user }
+  let(:user) { create(:group_member, :maintainer, user: create(:user), group: group ).user }
 
   before do
     sign_in(user)