Resolve spec conflicts

spec/features/merge_requests/closes_issues_spec.rb

@@ -79,7 +79,6 @@ feature 'Merge Request closing issues message', feature: true, js: true do
     it 'does not display closing issue message' do
       expect(page).to have_content("Closes issue #{issue_1.to_reference}. Issue #{issue_2.to_reference} is mentioned but will not be closed.")
       expect(page).to have_content("Issue #{issue_2.to_reference} is mentioned but will not be closed.")
-<<<<<<< HEAD
     end
   end
 
@@ -94,8 +93,6 @@ feature 'Merge Request closing issues message', feature: true, js: true do
     it 'displays closing issue message exactly one time' do
       wait_for_requests
       expect(page).to have_content("Closes issues #{issue_1.to_reference} and #{issue_2.to_reference}", count: 1)
-=======
->>>>>>> ce/master
     end
   end
 end

spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js

@@ -18,7 +18,6 @@ describe('MergeRequestStore', () => {
       store.setData({ ...mockData, work_in_progress: !mockData.work_in_progress });
       expect(store.hasSHAChanged).toBe(false);
     });
-<<<<<<< HEAD
   });
 
   describe('setCodeclimateHeadMetrics', () => {
@@ -60,7 +59,5 @@ describe('MergeRequestStore', () => {
     it('should return the resolved issues', () => {
       expect(store.codeclimateMetrics.resolvedIssues[0]).toEqual(baseIssues[1]);
     });
-=======
->>>>>>> ce/master
   });
 });

spec/lib/banzai/filter/milestone_reference_filter_spec.rb

@@ -261,7 +261,6 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
 
       expect(doc.css('a').first.text)
         .to eq "#{milestone.name} in #{another_project.path}"
-<<<<<<< HEAD
     end
   end
 
@@ -288,8 +287,6 @@ describe Banzai::Filter::MilestoneReferenceFilter, lib: true do
       allow_any_instance_of(Milestone).to receive(:title).and_return(%{"></a>whatever<a title="})
       doc = reference_filter("See #{reference}")
       expect(doc.css('a').first.text).to eq "#{milestone.name} in #{project_path}"
-=======
->>>>>>> ce/master
     end
   end
 end

spec/lib/gitlab/gitaly_client/notifications_spec.rb

@@ -9,11 +9,7 @@ describe Gitlab::GitalyClient::Notifications do
 
     it 'sends a post_receive message' do
       expect_any_instance_of(Gitaly::Notifications::Stub)
-<<<<<<< HEAD
-        .to receive(:post_receive).with(gitaly_request_with_path(storage_name, relative_path))
-=======
         .to receive(:post_receive).with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
->>>>>>> ce/master
 
       subject.post_receive
     end

spec/lib/gitlab/gitaly_client/ref_spec.rb

@@ -21,13 +21,8 @@ describe Gitlab::GitalyClient::Ref do
     it 'sends a find_all_branch_names message' do
       expect_any_instance_of(Gitaly::Ref::Stub)
         .to receive(:find_all_branch_names)
-<<<<<<< HEAD
-          .with(gitaly_request_with_path(storage_name, relative_path))
-          .and_return([])
-=======
         .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
         .and_return([])
->>>>>>> ce/master
 
       client.branch_names
     end
@@ -37,13 +32,8 @@ describe Gitlab::GitalyClient::Ref do
     it 'sends a find_all_tag_names message' do
       expect_any_instance_of(Gitaly::Ref::Stub)
         .to receive(:find_all_tag_names)
-<<<<<<< HEAD
-          .with(gitaly_request_with_path(storage_name, relative_path))
-          .and_return([])
-=======
         .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
         .and_return([])
->>>>>>> ce/master
 
       client.tag_names
     end
@@ -53,11 +43,7 @@ describe Gitlab::GitalyClient::Ref do
     it 'sends a find_default_branch_name message' do
       expect_any_instance_of(Gitaly::Ref::Stub)
         .to receive(:find_default_branch_name)
-<<<<<<< HEAD
-          .with(gitaly_request_with_path(storage_name, relative_path))
-=======
         .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
->>>>>>> ce/master
         .and_return(double(name: 'foo'))
 
       client.default_branch_name
@@ -68,13 +54,8 @@ describe Gitlab::GitalyClient::Ref do
     it 'sends a find_local_branches message' do
       expect_any_instance_of(Gitaly::Ref::Stub)
         .to receive(:find_local_branches)
-<<<<<<< HEAD
-          .with(gitaly_request_with_path(storage_name, relative_path))
-          .and_return([])
-=======
         .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
         .and_return([])
->>>>>>> ce/master
 
       client.local_branches
     end
@@ -82,13 +63,8 @@ describe Gitlab::GitalyClient::Ref do
     it 'parses and sends the sort parameter' do
       expect_any_instance_of(Gitaly::Ref::Stub)
         .to receive(:find_local_branches)
-<<<<<<< HEAD
-          .with(gitaly_request_with_params(sort_by: :UPDATED_DESC))
-          .and_return([])
-=======
         .with(gitaly_request_with_params(sort_by: :UPDATED_DESC), kind_of(Hash))
         .and_return([])
->>>>>>> ce/master
 
       client.local_branches(sort_by: 'updated_desc')
     end

spec/lib/gitlab/visibility_level_spec.rb

@@ -21,11 +21,7 @@ describe Gitlab::VisibilityLevel, lib: true do
 
   describe '.levels_for_user' do
     it 'returns all levels for an admin' do
-<<<<<<< HEAD
-      user = build(:user, :admin)
-=======
-      user = double(:user, admin?: true)
->>>>>>> ce/master
+      user = double(:user, has_full_private_access?: true)
 
       expect(described_class.levels_for_user(user))
         .to eq([Gitlab::VisibilityLevel::PRIVATE,
@@ -34,11 +30,7 @@ describe Gitlab::VisibilityLevel, lib: true do
     end
 
     it 'returns INTERNAL and PUBLIC for internal users' do
-<<<<<<< HEAD
-      user = build(:user)
-=======
-      user = double(:user, admin?: false, external?: false)
->>>>>>> ce/master
+      user = double(:user, has_full_private_access?: false, external?: false)
 
       expect(described_class.levels_for_user(user))
         .to eq([Gitlab::VisibilityLevel::INTERNAL,
@@ -46,11 +38,7 @@ describe Gitlab::VisibilityLevel, lib: true do
     end
 
     it 'returns PUBLIC for external users' do
-<<<<<<< HEAD
-      user = build(:user, :external)
-=======
-      user = double(:user, admin?: false, external?: true)
->>>>>>> ce/master
+      user = double(:user, has_full_private_access?: false, external?: true)
 
       expect(described_class.levels_for_user(user))
         .to eq([Gitlab::VisibilityLevel::PUBLIC])

spec/services/git_push_service_spec.rb

@@ -192,13 +192,8 @@ describe GitPushService, services: true do
     context "Updates merge requests" do
       it "when pushing a new branch for the first time" do
         expect(UpdateMergeRequestsWorker).to receive(:perform_async)
-<<<<<<< HEAD
             .with(project.id, user.id, blankrev, 'newrev', ref)
         execute_service(project, user, blankrev, 'newrev', ref)
-=======
-                                                .with(project.id, user.id, @blankrev, 'newrev', 'refs/heads/master')
-        execute_service(project, user, @blankrev, 'newrev', 'refs/heads/master' )
->>>>>>> ce/master
       end
     end
 

spec/workers/every_sidekiq_worker_spec.rb

@@ -7,11 +7,7 @@ describe 'Every Sidekiq worker' do
     ee_modules = root.join('ee').to_s
 
     workers = Dir[root.join('**', '*.rb')]
-<<<<<<< HEAD
       .reject { |path| path.start_with?(concerns, ee_modules) }
-=======
-      .reject { |path| path.start_with?(concerns) }
->>>>>>> ce/master
 
     workers.map do |path|
       ns = Pathname.new(path).relative_path_from(root).to_s.gsub('.rb', '')