Add latest changes from gitlab-org/gitlab@master

spec/workers/propagate_service_template_worker_spec.rb → spec/workers/propagate_instance_level_service_worker_spec.rb

@@ -2,13 +2,13 @@
 require 'spec_helper'
-describe PropagateServiceTemplateWorker do
+describe PropagateInstanceLevelServiceWorker do
   include ExclusiveLeaseHelpers
   describe '#perform' do
-    it 'calls the propagate service with the template' do
-      template = PushoverService.create(
-        template: true,
+    it 'calls the propagate service with the instance level service' do
+      instance_level_service = PushoverService.create(
+        instance: true,
         active: true,
         properties: {
           device: 'MyDevice',
@@ -18,14 +18,14 @@ describe PropagateServiceTemplateWorker do
           api_key: '123456789'
         })
-      stub_exclusive_lease("propagate_service_template_worker:#{template.id}",
-        timeout: PropagateServiceTemplateWorker::LEASE_TIMEOUT)
-      expect(Projects::PropagateServiceTemplate)
+      stub_exclusive_lease("propagate_instance_level_service_worker:#{instance_level_service.id}",
+        timeout: PropagateInstanceLevelServiceWorker::LEASE_TIMEOUT)
+      expect(Projects::PropagateInstanceLevelService)
         .to receive(:propagate)
-        .with(template)
-      subject.perform(template.id)
+        .with(instance_level_service)
+      subject.perform(instance_level_service.id)
     end
   end
 end

spec/workers/repository_fork_worker_spec.rb

@@ -72,13 +72,33 @@ describe RepositoryForkWorker do
         perform!
       end
-      it "handles bad fork" do
-        error_message = "Unable to fork project #{forked_project.id} for repository #{project.disk_path} -> #{forked_project.disk_path}"
+      it 'handles bad fork' do
+        error_message = "Unable to fork project #{forked_project.id} for repository #{project.disk_path} -> #{forked_project.disk_path}: Failed to create fork repository"
         expect_fork_repository.and_return(false)
         expect { perform! }.to raise_error(StandardError, error_message)
       end
+
+      it 'calls Projects::LfsPointers::LfsLinkService#execute with OIDs of source project LFS objects' do
+        expect_fork_repository.and_return(true)
+        expect_next_instance_of(Projects::LfsPointers::LfsLinkService) do |service|
+          expect(service).to receive(:execute).with(project.lfs_objects_oids)
+        end
+
+        perform!
+      end
+
+      it "handles LFS objects link failure" do
+        error_message = "Unable to fork project #{forked_project.id} for repository #{project.disk_path} -> #{forked_project.disk_path}: Source project has too many LFS objects"
+
+        expect_fork_repository.and_return(true)
+        expect_next_instance_of(Projects::LfsPointers::LfsLinkService) do |service|
+          expect(service).to receive(:execute).and_raise(Projects::LfsPointers::LfsLinkService::TooManyOidsError)
+        end
+
+        expect { perform! }.to raise_error(StandardError, error_message)
+      end
     end
     context 'only project ID passed' do