Resolve most spec conflicts

spec/db/production/settings.rb

-require 'spec_helper'
-
-describe 'seed production settings', lib: true do
-  include StubENV
-
-  context 'GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN is set in the environment' do
-    before do
-      stub_env('GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN', '013456789')
-    end
-
-    it 'writes the token to the database' do
-      load(File.join(__dir__, '../../../db/fixtures/production/010_settings.rb'))
-      expect(ApplicationSetting.current.runners_registration_token).to eq('013456789')
-    end
-  end
-end

spec/factories/projects.rb

@@ -42,15 +42,12 @@ FactoryGirl.define do
       import_status :failed
     end
 
-<<<<<<< HEAD
     trait :mirror do
       mirror true
       import_url { generate(:url) }
       mirror_user_id { creator_id }
     end
 
-=======
->>>>>>> ce/master
     trait :archived do
       archived true
     end

spec/features/protected_branches_spec.rb

 require 'spec_helper'
 
-<<<<<<< HEAD
-feature 'Projected Branches', feature: true, js: true do
+feature 'Protected Branches', feature: true, js: true do
   include ProtectedBranchHelpers
 
-=======
-feature 'Protected Branches', feature: true, js: true do
->>>>>>> ce/master
   let(:user) { create(:user, :admin) }
   let(:project) { create(:project, :repository) }
 

spec/lib/gitlab/etag_caching/router_spec.rb

@@ -68,19 +68,11 @@ describe Gitlab::EtagCaching::Router do
   end
 
   it 'matches build endpoint' do
-<<<<<<< HEAD
-    env = build_env(
-      '/my-group/my-project/builds/234.json'
-    )
-
-    result = described_class.match(env)
-=======
     request = build_request(
       '/my-group/my-project/builds/234.json'
     )
 
     result = described_class.match(request)
->>>>>>> ce/master
 
     expect(result).to be_present
     expect(result.name).to eq 'project_build'

spec/lib/gitlab/git_access_spec.rb

@@ -7,11 +7,7 @@ describe Gitlab::GitAccess, lib: true do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
   let(:actor) { user }
-<<<<<<< HEAD
-
-=======
   let(:protocol) { 'ssh' }
->>>>>>> ce/master
   let(:authentication_abilities) do
     [
       :read_project,
@@ -302,11 +298,7 @@ describe Gitlab::GitAccess, lib: true do
         let(:project) { create(:project, :repository, namespace: user.namespace) }
 
         context 'pull code' do
-<<<<<<< HEAD
-          it { expect { subject }.not_to raise_error }
-=======
           it { expect { pull_access_check }.not_to raise_error }
->>>>>>> ce/master
         end
       end
 
@@ -314,11 +306,7 @@ describe Gitlab::GitAccess, lib: true do
         before { project.team << [user, :reporter] }
 
         context 'pull code' do
-<<<<<<< HEAD
-          it { expect { subject }.not_to raise_error }
-=======
           it { expect { pull_access_check }.not_to raise_error }
->>>>>>> ce/master
         end
       end
 
@@ -329,21 +317,13 @@ describe Gitlab::GitAccess, lib: true do
           before { project.team << [user, :reporter] }
 
           context 'pull code' do
-<<<<<<< HEAD
-            it { expect { subject }.not_to raise_error }
-=======
             it { expect { pull_access_check }.not_to raise_error }
->>>>>>> ce/master
           end
         end
 
         context 'when is not member of the project' do
           context 'pull code' do
-<<<<<<< HEAD
-            it { expect { subject }.not_to raise_error }
-=======
             it { expect { pull_access_check }.to raise_unauthorized('You are not allowed to download code from this project.') }
->>>>>>> ce/master
           end
         end
       end

spec/lib/gitlab/import_export/all_models.yml

@@ -109,18 +109,15 @@ pipelines:
 - artifacts
 - pipeline_schedule
 - merge_requests
-<<<<<<< HEAD
 - source_pipeline
 - sourced_pipelines
 - triggered_by_pipeline
 - triggered_pipelines
-=======
 stages:
 - project
 - pipeline
 - statuses
 - builds
->>>>>>> ce/master
 statuses:
 - project
 - pipeline

spec/models/forked_project_link_spec.rb

@@ -3,10 +3,7 @@ require 'spec_helper'
 describe ForkedProjectLink, "add link on fork" do
   let(:project_from) { create(:project, :repository) }
   let(:user) { create(:user) }
-<<<<<<< HEAD
-=======
   let(:namespace) { user.namespace }
->>>>>>> ce/master
 
   before do
     create(:project_member, :reporter, user: user, project: project_from)

spec/models/project_spec.rb

@@ -1890,7 +1890,6 @@ describe Project, models: true do
         project.add_import_job
       end
 
-<<<<<<< HEAD
       context 'without mirror' do
         it 'returns nil' do
           project = create(:project)
@@ -1902,13 +1901,6 @@ describe Project, models: true do
       context 'without repository' do
         it 'schedules RepositoryImportWorker' do
           project = create(:empty_project, import_url: generate(:url))
-=======
-    context 'not forked' do
-      it 'schedules a RepositoryImportWorker job' do
-        project = create(:empty_project, import_url: generate(:url))
-
-        expect(RepositoryImportWorker).to receive(:perform_async).with(project.id)
->>>>>>> ce/master
 
           expect(RepositoryImportWorker).to receive(:perform_async).with(project.id)
 
@@ -1926,6 +1918,19 @@ describe Project, models: true do
         end
       end
     end
+
+    context 'not forked' do
+      it 'schedules a RepositoryImportWorker job' do
+        project = create(:empty_project, import_url: generate(:url))
+
+        expect(RepositoryImportWorker).to receive(:perform_async).with(project.id)
+
+          expect(RepositoryImportWorker).to receive(:perform_async).with(project.id)
+
+          project.add_import_job
+        end
+      end
+    end
   end
 
   describe '#gitlab_project_import?' do

spec/models/user_spec.rb

@@ -15,13 +15,10 @@ describe User, models: true do
 
   describe 'delegations' do
     it { is_expected.to delegate_method(:path).to(:namespace).with_prefix }
-<<<<<<< HEAD
 
     # EE
     it { is_expected.to delegate_method(:shared_runners_minutes_limit).to(:namespace) }
     it { is_expected.to delegate_method(:shared_runners_minutes_limit=).to(:namespace).with_arguments(133) }
-=======
->>>>>>> ce/master
   end
 
   describe 'associations' do

spec/requests/api/users_spec.rb

@@ -457,7 +457,6 @@ describe API::Users do
 
         expect(response).to have_http_status(403)
       end
-<<<<<<< HEAD
 
       it "cannot update their own shared_runners_minutes_limit" do
         expect do
@@ -466,8 +465,6 @@ describe API::Users do
 
         expect(response).to have_http_status(403)
       end
-=======
->>>>>>> ce/master
     end
 
     it "returns 404 for non-existing user" do

spec/serializers/pipeline_details_entity_spec.rb

@@ -116,7 +116,6 @@ describe PipelineDetailsEntity do
         expect(subject[:flags][:yaml_errors]).to be false
       end
     end
-<<<<<<< HEAD
 
     context 'when pipeline is triggered by other pipeline' do
       let(:pipeline) { create(:ci_empty_pipeline) }
@@ -152,7 +151,5 @@ describe PipelineDetailsEntity do
         expect(subject[:triggered].first[:project]).not_to be_nil
       end
     end
-=======
->>>>>>> ce/master
   end
 end

spec/services/create_deployment_service_spec.rb

@@ -174,17 +174,9 @@ describe CreateDeploymentService, services: true do
         { environment: { name: 'production', url: 'http://gitlab.com' } }
       end
 
-<<<<<<< HEAD
-      context 'when pipeline succeeds' do
-        it_behaves_like 'does create environment and deployment' do
-          let(:deployable) { build }
-
-          subject { build.success }
-=======
       context 'when job succeeds' do
         it_behaves_like 'creates deployment' do
           subject { job.success }
->>>>>>> ce/master
         end
       end
 

spec/services/projects/fork_service_spec.rb

@@ -3,11 +3,7 @@ require 'spec_helper'
 describe Projects::ForkService, services: true do
   describe 'fork by user' do
     before do
-<<<<<<< HEAD
-      @from_user = create(:user )
-=======
       @from_user = create(:user)
->>>>>>> ce/master
       @from_namespace = @from_user.namespace
       avatar = fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "image/png")
       @from_project = create(:project,

spec/spec_helper.rb

@@ -56,11 +56,8 @@ RSpec.configure do |config|
   config.include StubGitlabCalls
   config.include StubGitlabData
   config.include ApiHelpers, :api
-<<<<<<< HEAD
-  config.include Rails.application.routes.url_helpers, type: :routing
-=======
   config.include MigrationsHelpers, :migration
->>>>>>> ce/master
+  config.include Rails.application.routes.url_helpers, type: :routing
 
   config.infer_spec_type_from_file_location!