spec

5 files changed, 35 insertions, 15 deletions

diff --git a/app/models/member.rb b/app/models/member.rb
index 43bd1678518..5392a85b1e0 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -69,9 +69,9 @@ class Member < ActiveRecord::Base
   scope :guests, -> { active.where(access_level: GUEST) }
   scope :reporters, -> { active.where(access_level: REPORTER) }
   scope :developers, -> { active.where(access_level: DEVELOPER) }
-  scope :maintainers,  -> { active.where(access_level: MAINTAINER) }
+  scope :maintainers, -> { active.where(access_level: MASTER) }
   scope :owners,  -> { active.where(access_level: OWNER) }
-  scope :owners_and_masters,  -> { active.where(access_level: [OWNER, MAINTAINER]) }
+  scope :owners_and_masters,  -> { active.where(access_level: [OWNER, MASTER]) }
 
   scope :order_name_asc, -> { left_join_users.reorder(Gitlab::Database.nulls_last_order('users.name', 'ASC')) }
   scope :order_name_desc, -> { left_join_users.reorder(Gitlab::Database.nulls_last_order('users.name', 'DESC')) }
diff --git a/spec/models/concerns/protected_ref_access_spec.rb b/spec/models/concerns/protected_ref_access_spec.rb
index 8a2ba44b961..14ce1084742 100644
--- a/spec/models/concerns/protected_ref_access_spec.rb
+++ b/spec/models/concerns/protected_ref_access_spec.rb
@@ -14,11 +14,11 @@ describe ProtectedRefAccess do
       expect(protected_ref_access.check_access(admin)).to be_truthy
     end
 
-    it 'is true for masters' do
-      master = create(:user)
-      project.add_maintainer(master)
+    it 'is true for maintainers' do
+      maintainer = create(:user)
+      project.add_maintainer(maintainer)
 
-      expect(protected_ref_access.check_access(master)).to be_truthy
+      expect(protected_ref_access.check_access(maintainer)).to be_truthy
     end
 
     it 'is for developers of the project' do
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index c154a7c0f18..1baf23a66aa 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -317,7 +317,7 @@ describe Group do
     end
 
     it { expect(group.has_owner?(@members[:owner])).to be_truthy }
-    it { expect(group.has_owner?(@members[:master])).to be_falsey }
+    it { expect(group.has_owner?(@members[:maintainer])).to be_falsey }
     it { expect(group.has_owner?(@members[:developer])).to be_falsey }
     it { expect(group.has_owner?(@members[:reporter])).to be_falsey }
     it { expect(group.has_owner?(@members[:guest])).to be_falsey }
@@ -328,11 +328,15 @@ describe Group do
   describe '#has_maintainer?' do
     before do
       @members = setup_group_members(group)
-      create(:group_member, :invited, :master, group: group)
+      create(:group_member, :invited, :maintainer, group: group)
     end
 
     it { expect(group.has_maintainer?(@members[:owner])).to be_falsey }
+<<<<<<< HEAD
     it { expect(group.has_maintainer?(@members[:master])).to be_truthy }
+=======
+    it { expect(group.has_maintainer?(@members[:maintainer])).to be_truthy }
+>>>>>>> spec
     it { expect(group.has_maintainer?(@members[:developer])).to be_falsey }
     it { expect(group.has_maintainer?(@members[:reporter])).to be_falsey }
     it { expect(group.has_maintainer?(@members[:guest])).to be_falsey }
@@ -401,7 +405,7 @@ describe Group do
   def setup_group_members(group)
     members = {
       owner: create(:user),
-      master: create(:user),
+      maintainer: create(:user),
       developer: create(:user),
       reporter: create(:user),
       guest: create(:user),
@@ -409,7 +413,11 @@ describe Group do
     }
 
     group.add_user(members[:owner], GroupMember::OWNER)
+<<<<<<< HEAD
     group.add_user(members[:master], GroupMember::MAINTAINER)
+=======
+    group.add_user(members[:maintainer], GroupMember::MASTER)
+>>>>>>> spec
     group.add_user(members[:developer], GroupMember::DEVELOPER)
     group.add_user(members[:reporter], GroupMember::REPORTER)
     group.add_user(members[:guest], GroupMember::GUEST)
@@ -439,25 +447,33 @@ describe Group do
 
   describe '#members_with_parents', :nested_groups do
     let!(:group) { create(:group, :nested) }
+<<<<<<< HEAD
     let!(:master) { group.parent.add_user(create(:user), GroupMember::MAINTAINER) }
+=======
+    let!(:maintainer) { group.parent.add_user(create(:user), GroupMember::MASTER) }
+>>>>>>> spec
     let!(:developer) { group.add_user(create(:user), GroupMember::DEVELOPER) }
 
     it 'returns parents members' do
       expect(group.members_with_parents).to include(developer)
-      expect(group.members_with_parents).to include(master)
+      expect(group.members_with_parents).to include(maintainer)
     end
   end
 
   describe '#direct_and_indirect_members', :nested_groups do
     let!(:group) { create(:group, :nested) }
     let!(:sub_group) { create(:group, parent: group) }
+<<<<<<< HEAD
     let!(:master) { group.parent.add_user(create(:user), GroupMember::MAINTAINER) }
+=======
+    let!(:maintainer) { group.parent.add_user(create(:user), GroupMember::MASTER) }
+>>>>>>> spec
     let!(:developer) { group.add_user(create(:user), GroupMember::DEVELOPER) }
     let!(:other_developer) { group.add_user(create(:user), GroupMember::DEVELOPER) }
 
     it 'returns parents members' do
       expect(group.direct_and_indirect_members).to include(developer)
-      expect(group.direct_and_indirect_members).to include(master)
+      expect(group.direct_and_indirect_members).to include(maintainer)
     end
 
     it 'returns descendant members' do
@@ -539,14 +555,18 @@ describe Group do
 
   describe '#user_ids_for_project_authorizations' do
     it 'returns the user IDs for which to refresh authorizations' do
-      master = create(:user)
+      maintainer = create(:user)
       developer = create(:user)
 
+<<<<<<< HEAD
       group.add_user(master, GroupMember::MAINTAINER)
+=======
+      group.add_user(maintainer, GroupMember::MASTER)
+>>>>>>> spec
       group.add_user(developer, GroupMember::DEVELOPER)
 
       expect(group.user_ids_for_project_authorizations)
-        .to include(master.id, developer.id)
+        .to include(maintainer.id, developer.id)
     end
   end
 
diff --git a/spec/policies/ci/build_policy_spec.rb b/spec/policies/ci/build_policy_spec.rb
index 9d641bf3dd2..d475d651baa 100644
--- a/spec/policies/ci/build_policy_spec.rb
+++ b/spec/policies/ci/build_policy_spec.rb
@@ -209,7 +209,7 @@ describe Ci::BuildPolicy do
           project.add_maintainer(user)
         end
 
-        context 'when masters can push to the branch' do
+        context 'when maintainers can push to the branch' do
           before do
             create(:protected_branch, :masters_can_push,
                    name: build.ref, project: project)
diff --git a/spec/policies/protected_branch_policy_spec.rb b/spec/policies/protected_branch_policy_spec.rb
index 94a1686e4d7..1587196754d 100644
--- a/spec/policies/protected_branch_policy_spec.rb
+++ b/spec/policies/protected_branch_policy_spec.rb
@@ -8,7 +8,7 @@ describe ProtectedBranchPolicy do
 
   subject { described_class.new(user, protected_branch) }
 
-  it 'branches can be updated via project masters' do
+  it 'branches can be updated via project maintainers' do
     project.add_maintainer(user)
 
     is_expected.to be_allowed(:update_protected_branch)