Add latest changes from gitlab-org/gitlab@master

4 files changed, 27 insertions, 34 deletions

diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb
index bce3f72a287..24781ac86be 100644
--- a/spec/services/projects/create_service_spec.rb
+++ b/spec/services/projects/create_service_spec.rb
@@ -15,7 +15,7 @@ describe Projects::CreateService, '#execute' do
     }
   end
 
-  it 'creates labels on Project creation if there are templates' do
+  it 'creates labels on Project creation if there are instance level services' do
     Label.create(title: "bug", template: true)
     project = create_project(user, opts)
 
@@ -90,7 +90,7 @@ describe Projects::CreateService, '#execute' do
     end
 
     it 'sets invalid service as inactive' do
-      create(:service, type: 'JiraService', project: nil, template: true, active: true)
+      create(:service, type: 'JiraService', project: nil, instance: true, active: true)
 
       project = create_project(user, opts)
       service = project.services.first
@@ -336,22 +336,22 @@ describe Projects::CreateService, '#execute' do
     end
   end
 
-  context 'when there is an active service template' do
+  context 'when there is an active instance level service' do
     before do
-      create(:service, project: nil, template: true, active: true)
+      create(:service, project: nil, instance: true, active: true)
     end
 
-    it 'creates a service from this template' do
+    it 'creates a service from instance level service' do
       project = create_project(user, opts)
 
       expect(project.services.count).to eq 1
     end
   end
 
-  context 'when a bad service template is created' do
+  context 'when a bad instance level service is created' do
     it 'sets service to be inactive' do
       opts[:import_url] = 'http://www.gitlab.com/gitlab-org/gitlab-foss'
-      create(:service, type: 'DroneCiService', project: nil, template: true, active: true)
+      create(:service, type: 'DroneCiService', project: nil, instance: true, active: true)
 
       project = create_project(user, opts)
       service = project.services.first
diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb
index e7b904fcd60..e14f1abf018 100644
--- a/spec/services/projects/fork_service_spec.rb
+++ b/spec/services/projects/fork_service_spec.rb
@@ -375,14 +375,6 @@ describe Projects::ForkService do
         expect(fork_from_project.forks_count).to eq(1)
       end
 
-      it 'leaves no LFS objects dangling' do
-        create(:lfs_objects_project, project: fork_to_project)
-
-        expect { subject.execute(fork_to_project) }
-          .to change { fork_to_project.lfs_objects_projects.count }
-          .to(0)
-      end
-
       context 'if the fork is not allowed' do
         let(:fork_from_project) { create(:project, :private) }
 
diff --git a/spec/services/projects/lfs_pointers/lfs_download_service_spec.rb b/spec/services/projects/lfs_pointers/lfs_download_service_spec.rb
index 970e82e7107..21a139cdf3c 100644
--- a/spec/services/projects/lfs_pointers/lfs_download_service_spec.rb
+++ b/spec/services/projects/lfs_pointers/lfs_download_service_spec.rb
@@ -48,10 +48,11 @@ describe Projects::LfsPointers::LfsDownloadService do
   end
 
   shared_examples 'lfs object is created' do
-    it do
+    it 'creates and associate the LFS object to project' do
       expect(subject).to receive(:download_and_save_file!).and_call_original
 
       expect { subject.execute }.to change { LfsObject.count }.by(1)
+      expect(LfsObject.first.projects).to include(project)
     end
 
     it 'returns success result' do
diff --git a/spec/services/projects/propagate_service_template_spec.rb b/spec/services/projects/propagate_instance_level_service_spec.rb
index 2c3effec617..a842842a010 100644
--- a/spec/services/projects/propagate_service_template_spec.rb
+++ b/spec/services/projects/propagate_instance_level_service_spec.rb
@@ -2,11 +2,11 @@
 
 require 'spec_helper'
 
-describe Projects::PropagateServiceTemplate do
+describe Projects::PropagateInstanceLevelService do
   describe '.propagate' do
-    let!(:service_template) do
+    let!(:instance_level_integration) do
       PushoverService.create(
-        template: true,
+        instance: true,
         active: true,
         properties: {
           device: 'MyDevice',
@@ -22,14 +22,14 @@ describe Projects::PropagateServiceTemplate do
     it 'creates services for projects' do
       expect(project.pushover_service).to be_nil
 
-      described_class.propagate(service_template)
+      described_class.propagate(instance_level_integration)
 
       expect(project.reload.pushover_service).to be_present
     end
 
     it 'creates services for a project that has another service' do
       BambooService.create(
-        template: true,
+        instance: true,
         active: true,
         project: project,
         properties: {
@@ -42,14 +42,14 @@ describe Projects::PropagateServiceTemplate do
 
       expect(project.pushover_service).to be_nil
 
-      described_class.propagate(service_template)
+      described_class.propagate(instance_level_integration)
 
       expect(project.reload.pushover_service).to be_present
     end
 
     it 'does not create the service if it exists already' do
       other_service = BambooService.create(
-        template: true,
+        instance: true,
         active: true,
         properties: {
           bamboo_url: 'http://gitlab.com',
@@ -59,17 +59,17 @@ describe Projects::PropagateServiceTemplate do
         }
       )
 
-      Service.build_from_template(project.id, service_template).save!
-      Service.build_from_template(project.id, other_service).save!
+      Service.build_from_instance(project.id, instance_level_integration).save!
+      Service.build_from_instance(project.id, other_service).save!
 
-      expect { described_class.propagate(service_template) }
+      expect { described_class.propagate(instance_level_integration) }
         .not_to change { Service.count }
     end
 
-    it 'creates the service containing the template attributes' do
-      described_class.propagate(service_template)
+    it 'creates the service containing the instance attributes' do
+      described_class.propagate(instance_level_integration)
 
-      expect(project.pushover_service.properties).to eq(service_template.properties)
+      expect(project.pushover_service.properties).to eq(instance_level_integration.properties)
     end
 
     describe 'bulk update', :use_sql_query_cache do
@@ -80,7 +80,7 @@ describe Projects::PropagateServiceTemplate do
 
         project_total.times { create(:project) }
 
-        described_class.propagate(service_template)
+        described_class.propagate(instance_level_integration)
       end
 
       it 'creates services for all projects' do
@@ -90,18 +90,18 @@ describe Projects::PropagateServiceTemplate do
 
     describe 'external tracker' do
       it 'updates the project external tracker' do
-        service_template.update!(category: 'issue_tracker', default: false)
+        instance_level_integration.update!(category: 'issue_tracker', default: false)
 
-        expect { described_class.propagate(service_template) }
+        expect { described_class.propagate(instance_level_integration) }
           .to change { project.reload.has_external_issue_tracker }.to(true)
       end
     end
 
     describe 'external wiki' do
       it 'updates the project external tracker' do
-        service_template.update!(type: 'ExternalWikiService')
+        instance_level_integration.update!(type: 'ExternalWikiService')
 
-        expect { described_class.propagate(service_template) }
+        expect { described_class.propagate(instance_level_integration) }
           .to change { project.reload.has_external_wiki }.to(true)
       end
     end