CE->EE: resolve remaining spec conflicts

spec/controllers/projects/imports_controller_spec.rb

@@ -11,8 +11,6 @@ describe Projects::ImportsController do
 
   describe 'GET #show' do
     context 'when repository does not exists' do
-<<<<<<< HEAD
-=======
       let(:project) { create(:project) }
 
       before do
@@ -20,7 +18,6 @@ describe Projects::ImportsController do
         project.team << [user, :master]
       end
 
->>>>>>> ce/master
       it 'renders template' do
         get :show, namespace_id: project.namespace.to_param, project_id: project
 

spec/controllers/projects/settings/integrations_controller_spec.rb

 require 'spec_helper'
 
 describe Projects::Settings::IntegrationsController do
-<<<<<<< HEAD
-  let(:namespace) { create(:group, :private) }
-  let(:project) { create(:project, :private, namespace: namespace) }
-=======
   let(:project) { create(:project, :public) }
->>>>>>> ce/master
   let(:user) { create(:user) }
 
   before do
@@ -69,6 +64,9 @@ describe Projects::Settings::IntegrationsController do
     end
 
     context 'with a license key' do
+      let(:namespace) { create(:group, :private) }
+      let(:project) { create(:project, :private, namespace: namespace) }
+
       context 'when checking of namespace plan is enabled' do
         before do
           allow_any_instance_of(Project).to receive_message_chain(:current_application_settings, :should_check_namespace_plan?) { true }

spec/features/boards/boards_spec.rb

@@ -5,13 +5,9 @@ describe 'Issue Boards', js: true do
 
   let(:group) { create(:group, :nested) }
   let(:project) { create(:project, :public, namespace: group) }
-<<<<<<< HEAD
   let(:milestone) { create(:milestone, title: "v2.2", project: project) }
   let!(:board)  { create(:board, project: project) }
   let!(:board_with_milestone)  { create(:board, project: project, milestone: milestone) }
-=======
-  let(:board)   { create(:board, project: project) }
->>>>>>> ce/master
   let(:user)    { create(:user) }
   let!(:user2)  { create(:user) }
 

spec/helpers/gitlab_routing_helper_spec.rb

@@ -12,20 +12,10 @@ describe GitlabRoutingHelper do
     end
 
     describe '#request_access_project_members_path' do
-<<<<<<< HEAD
-      let(:project) { build_stubbed(:project) }
-
-=======
->>>>>>> ce/master
       it { expect(request_access_project_members_path(project)).to eq request_access_project_project_members_path(project) }
     end
 
     describe '#leave_project_members_path' do
-<<<<<<< HEAD
-      let(:project) { build_stubbed(:project) }
-
-=======
->>>>>>> ce/master
       it { expect(leave_project_members_path(project)).to eq leave_project_project_members_path(project) }
     end
 

spec/helpers/groups_helper_spec.rb

@@ -42,10 +42,7 @@ describe GroupsHelper do
   end
 
   describe 'group_lfs_status' do
-<<<<<<< HEAD
-=======
     let(:group) { create(:group) }
->>>>>>> ce/master
     let!(:project) { create(:project, namespace_id: group.id) }
 
     before do

spec/lib/banzai/filter/upload_link_filter_spec.rb

@@ -86,7 +86,6 @@ describe Banzai::Filter::UploadLinkFilter do
 
       doc = filter(image(escaped))
       expect(doc.at_css('img')['src']).to match "#{Gitlab.config.gitlab.url}/#{project.full_path}/uploads/%ED%95%9C%EA%B8%80.png"
-<<<<<<< HEAD
     end
 
     context 'in a geo secondary node' do
@@ -113,8 +112,6 @@ describe Banzai::Filter::UploadLinkFilter do
         doc = filter(link('http://example.com'))
         expect(doc.at_css('a')['href']).to eq 'http://example.com'
       end
-=======
->>>>>>> ce/master
     end
   end
 

spec/lib/gitlab/import_export/all_models.yml

@@ -117,13 +117,10 @@ pipelines:
 - artifacts
 - pipeline_schedule
 - merge_requests
-<<<<<<< HEAD
 - source_pipeline
 - sourced_pipelines
 - triggered_by_pipeline
 - triggered_pipelines
-=======
->>>>>>> ce/master
 pipeline_variables:
 - pipeline
 stages:

spec/models/concerns/issuable_spec.rb

@@ -156,7 +156,6 @@ describe Issuable do
 
   describe "#sort" do
     let(:project) { create(:project) }
-<<<<<<< HEAD
 
     context "by weight" do
       let!(:issue)  { create(:issue, project: project) }
@@ -174,8 +173,6 @@ describe Issuable do
         expect(issues).to match_array([issue2, issue3, issue4, issue])
       end
     end
-=======
->>>>>>> ce/master
 
     context "by milestone due date" do
       # Correct order is:

spec/models/project_spec.rb

@@ -2747,10 +2747,6 @@ describe Project do
   end
 
   describe '#remove_private_deploy_keys' do
-<<<<<<< HEAD
-    it 'removes the private deploy keys of a project' do
-      project = create(:project)
-=======
     let!(:project) { create(:project) }
 
     context 'for a private deploy key' do
@@ -2770,7 +2766,6 @@ describe Project do
           another_project = create(:project)
           create(:deploy_keys_project, deploy_key: key, project: another_project)
         end
->>>>>>> ce/master
 
         it 'does not remove the key' do
           project.remove_private_deploy_keys

spec/requests/api/boards_spec.rb

@@ -6,10 +6,9 @@ describe API::Boards do
   let(:guest)       { create(:user) }
   let(:admin)       { create(:user, :admin) }
   let!(:project)    { create(:project, :public, creator_id: user.id, namespace: user.namespace ) }
-<<<<<<< HEAD
+
+  # EE only
   let(:milestone)   { create(:milestone, project: project) }
-=======
->>>>>>> ce/master
 
   let!(:dev_label) do
     create(:label, title: 'Development', color: '#FFAABB', project: project)

spec/requests/api/groups_spec.rb

@@ -590,11 +590,7 @@ describe API::Groups do
 
   describe "POST /groups/:id/projects/:project_id" do
     let(:project) { create(:project) }
-<<<<<<< HEAD
-    let(:project_path) { project.full_path.gsub('/', '%2F') }
-=======
     let(:project_path) { CGI.escape(project.full_path) }
->>>>>>> ce/master
 
     before(:each) do
       allow_any_instance_of(Projects::TransferService)

spec/requests/api/v3/groups_spec.rb

@@ -650,11 +650,7 @@ describe API::V3::Groups do
 
   describe "POST /groups/:id/projects/:project_id" do
     let(:project) { create(:project) }
-<<<<<<< HEAD
-    let(:project_path) { "#{project.namespace.path}%2F#{project.path}" }
-=======
     let(:project_path) { CGI.escape(project.full_path) }
->>>>>>> ce/master
 
     before(:each) do
       allow_any_instance_of(Projects::TransferService)

spec/requests/lfs_http_spec.rb

@@ -702,15 +702,9 @@ describe 'Git LFS API and storage' do
 
             it 'responds with upload hypermedia link' do
               expect(json_response['objects']).to be_kind_of(Array)
-<<<<<<< HEAD
               expect(json_response['objects'].first['oid']).to eq(sample_oid)
               expect(json_response['objects'].first['size']).to eq(sample_size)
               expect(json_response['objects'].first['actions']['upload']['href']).to eq("#{Gitlab.config.gitlab.url}/#{project.full_path}.git/gitlab-lfs/objects/#{sample_oid}/#{sample_size}")
-=======
-              expect(json_response['objects'].first['oid']).to eq("91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897")
-              expect(json_response['objects'].first['size']).to eq(1575078)
-              expect(json_response['objects'].first['actions']['upload']['href']).to eq("#{Gitlab.config.gitlab.url}/#{project.full_path}.git/gitlab-lfs/objects/91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897/1575078")
->>>>>>> ce/master
               expect(json_response['objects'].first['actions']['upload']['header']).to eq('Authorization' => authorization)
             end
 

spec/services/boards/issues/list_service_spec.rb

@@ -21,15 +21,9 @@ describe Boards::Issues::ListService do
     let!(:list2)   { create(:list, board: board, label: testing, position: 1) }
     let!(:closed)  { create(:closed_list, board: board) }
 
-<<<<<<< HEAD
     let!(:opened_issue1) { create(:labeled_issue, project: project, milestone: m1, title: 'Issue 1', labels: [bug]) }
     let!(:opened_issue2) { create(:labeled_issue, project: project, milestone: m2, title: 'Issue 2', labels: [p2]) }
     let!(:reopened_issue1) { create(:issue, :opened, project: project, title: 'Issue 3' ) }
-=======
-    let!(:opened_issue1) { create(:labeled_issue, project: project, labels: [bug]) }
-    let!(:opened_issue2) { create(:labeled_issue, project: project, labels: [p2]) }
-    let!(:reopened_issue1) { create(:issue, :opened, project: project) }
->>>>>>> ce/master
 
     let!(:list1_issue1) { create(:labeled_issue, project: project, milestone: m1, labels: [p2, development]) }
     let!(:list1_issue2) { create(:labeled_issue, project: project, milestone: m2, labels: [development]) }

spec/services/ci/pipeline_trigger_service_spec.rb

 require 'spec_helper'
 
-<<<<<<< HEAD
-describe Ci::PipelineTriggerService, services: true do
-=======
 describe Ci::PipelineTriggerService do
->>>>>>> ce/master
   let(:project) { create(:project, :repository) }
 
   before do

spec/services/wiki_pages/create_service_spec.rb

@@ -2,11 +2,7 @@ require 'spec_helper'
 
 describe WikiPages::CreateService do
   let(:project) { create(:project) }
-<<<<<<< HEAD
-  let(:user)    { create(:user) }
-=======
   let(:user) { create(:user) }
->>>>>>> ce/master
 
   let(:opts) do
     {

spec/services/wiki_pages/destroy_service_spec.rb

@@ -2,13 +2,8 @@ require 'spec_helper'
 
 describe WikiPages::DestroyService do
   let(:project) { create(:project) }
-<<<<<<< HEAD
-  let(:user)    { create(:user) }
-  let(:page)    { create(:wiki_page) }
-=======
   let(:user) { create(:user) }
   let(:page) { create(:wiki_page) }
->>>>>>> ce/master
 
   subject(:service) { described_class.new(project, user) }
 

spec/services/wiki_pages/update_service_spec.rb

@@ -2,13 +2,8 @@ require 'spec_helper'
 
 describe WikiPages::UpdateService do
   let(:project) { create(:project) }
-<<<<<<< HEAD
-  let(:user)    { create(:user) }
-  let(:page)    { create(:wiki_page) }
-=======
   let(:user) { create(:user) }
   let(:page) { create(:wiki_page) }
->>>>>>> ce/master
 
   let(:opts) do
     {