Fix specs for `GitAccess` and `UserAccess`.

- As part of gitlab-org/gitlab-ce!5824, the `protected_branches` factory
  creates default `MASTER` access levels for merging and pushing.

- Some specs rely on the condition that no pre-existing access levels
  exist when a protected branch is created, and these specs were
  failing.

- Added a factory trait to remove the default access levels.

spec/factories/protected_branches.rb

@@ -13,6 +13,13 @@ FactoryGirl.define do
       authorize_user_to_merge nil
     end
 
+    trait :remove_default_access_levels do
+      after(:create) do |protected_branch|
+        protected_branch.push_access_levels.destroy_all
+        protected_branch.merge_access_levels.destroy_all
+      end
+    end
+
     trait :developers_can_push do
       after(:create) do |protected_branch|
         protected_branch.push_access_levels.create!(access_level: Gitlab::Access::DEVELOPER)

spec/lib/gitlab/git_access_spec.rb

@@ -245,19 +245,19 @@ describe Gitlab::GitAccess, lib: true do
 
     [['feature', 'exact'], ['feat*', 'wildcard']].each do |protected_branch_name, protected_branch_type|
       context do
-        before { create(:protected_branch, :masters_can_push, name: protected_branch_name, project: project) }
+        before { create(:protected_branch, :remove_default_access_levels, :masters_can_push, name: protected_branch_name, project: project) }
 
         run_permission_checks(permissions_matrix)
       end
 
       context "when developers are allowed to push into the #{protected_branch_type} protected branch" do
-        before { create(:protected_branch, :masters_can_push, :developers_can_push, name: protected_branch_name, project: project) }
+        before { create(:protected_branch, :remove_default_access_levels, :masters_can_push, :developers_can_push, name: protected_branch_name, project: project) }
 
         run_permission_checks(permissions_matrix.deep_merge(developer: { push_protected_branch: true, push_all: true, merge_into_protected_branch: true }))
       end
 
       context "developers are allowed to merge into the #{protected_branch_type} protected branch" do
-        before { create(:protected_branch, :masters_can_push, :developers_can_merge, name: protected_branch_name, project: project) }
+        before { create(:protected_branch, :remove_default_access_levels, :masters_can_push, :developers_can_merge, name: protected_branch_name, project: project) }
 
         context "when a merge request exists for the given source/target branch" do
           context "when the merge request is in progress" do
@@ -284,7 +284,7 @@ describe Gitlab::GitAccess, lib: true do
       end
 
       context "when developers are allowed to push and merge into the #{protected_branch_type} protected branch" do
-        before { create(:protected_branch, :masters_can_push, :developers_can_merge, :developers_can_push, name: protected_branch_name, project: project) }
+        before { create(:protected_branch, :remove_default_access_levels, :masters_can_push, :developers_can_merge, :developers_can_push, name: protected_branch_name, project: project) }
 
         run_permission_checks(permissions_matrix.deep_merge(developer: { push_protected_branch: true, push_all: true, merge_into_protected_branch: true }))
       end
@@ -293,7 +293,7 @@ describe Gitlab::GitAccess, lib: true do
         let(:user) { create(:user) }
 
         before do
-          create(:protected_branch, authorize_user_to_push: user, name: protected_branch_name, project: project)
+          create(:protected_branch, :remove_default_access_levels, authorize_user_to_push: user, name: protected_branch_name, project: project)
         end
 
         run_permission_checks(permissions_matrix.deep_merge(developer: { push_protected_branch: true, push_all: true, merge_into_protected_branch: true },
@@ -306,7 +306,7 @@ describe Gitlab::GitAccess, lib: true do
 
         before do
           create(:merge_request, source_project: project, source_branch: unprotected_branch, target_branch: 'feature', state: 'locked', in_progress_merge_commit_sha: merge_into_protected_branch)
-          create(:protected_branch, authorize_user_to_merge: user, name: protected_branch_name, project: project)
+          create(:protected_branch, :remove_default_access_levels, authorize_user_to_merge: user, name: protected_branch_name, project: project)
         end
 
         run_permission_checks(permissions_matrix.deep_merge(admin: { push_protected_branch: false, push_all: false, merge_into_protected_branch: true },
@@ -321,7 +321,7 @@ describe Gitlab::GitAccess, lib: true do
 
         before do
           create(:merge_request, source_project: project, source_branch: unprotected_branch, target_branch: 'feature', state: 'locked', in_progress_merge_commit_sha: merge_into_protected_branch)
-          create(:protected_branch, authorize_user_to_push: user, authorize_user_to_merge: user, name: protected_branch_name, project: project)
+          create(:protected_branch, :remove_default_access_levels, authorize_user_to_push: user, authorize_user_to_merge: user, name: protected_branch_name, project: project)
         end
 
         run_permission_checks(permissions_matrix.deep_merge(developer: { push_protected_branch: true, push_all: true, merge_into_protected_branch: true },
@@ -330,7 +330,7 @@ describe Gitlab::GitAccess, lib: true do
       end
 
       context "when no one is allowed to push to the #{protected_branch_name} protected branch" do
-        before { create(:protected_branch, :no_one_can_push, name: protected_branch_name, project: project) }
+        before { create(:protected_branch, :remove_default_access_levels, :no_one_can_push, name: protected_branch_name, project: project) }
 
         run_permission_checks(permissions_matrix.deep_merge(developer: { push_protected_branch: false, push_all: false, merge_into_protected_branch: false },
                                                             master: { push_protected_branch: false, push_all: false, merge_into_protected_branch: false },

spec/lib/gitlab/user_access_spec.rb

@@ -66,7 +66,7 @@ describe Gitlab::UserAccess, lib: true do
     end
 
     describe 'push to protected branch' do
-      let(:branch) { create :protected_branch, project: project }
+      let(:branch) { create :protected_branch, :remove_default_access_levels, project: project }
 
       it 'returns false if user is a master' do
         project.team << [user, :master]