Add latest changes from gitlab-org/gitlab@master

spec/models/lfs_object_spec.rb

@@ -13,6 +13,15 @@ describe LfsObject do
         expect(described_class.not_linked_to_project(project)).to contain_exactly(other_lfs_object)
       end
     end
+
+    describe '.for_oids' do
+      it 'returns the correct LfsObjects' do
+        lfs_object_1, lfs_object_2 = create_list(:lfs_object, 2)
+
+        expect(described_class.for_oids(lfs_object_1.oid)).to contain_exactly(lfs_object_1)
+        expect(described_class.for_oids([lfs_object_1.oid, lfs_object_2.oid])).to contain_exactly(lfs_object_1, lfs_object_2)
+      end
+    end
   end
   it 'has a distinct has_many :projects relation through lfs_objects_projects' do

spec/services/projects/lfs_pointers/lfs_link_service_spec.rb

@@ -60,8 +60,8 @@ describe Projects::LfsPointers::LfsLinkService do
       stub_const("#{described_class}::BATCH_SIZE", 1)
       oids = %w(one two)
-      expect(LfsObject).to receive(:where).with(oid: %w(one)).once.and_call_original
-      expect(LfsObject).to receive(:where).with(oid: %w(two)).once.and_call_original
+      expect(LfsObject).to receive(:for_oids).with(%w(one)).once.and_call_original
+      expect(LfsObject).to receive(:for_oids).with(%w(two)).once.and_call_original
       subject.execute(oids)
     end

spec/services/projects/update_pages_service_spec.rb

@@ -82,6 +82,9 @@ describe Projects::UpdatePagesService do
         expect(execute).not_to eq(:success)
         expect(project.pages_metadatum).not_to be_deployed
+
+        expect(deploy_status).to be_failed
+        expect(deploy_status.description).to eq('build SHA is outdated for this ref')
       end
       context 'when using empty file' do

spec/support/shared_examples/tasks/gitlab/uploads/migration_shared_examples.rb

+# frozen_string_literal: true
+
+# Expects the calling spec to define:
+# - uploader_class
+# - model_class
+# - mounted_as
+RSpec.shared_examples 'enqueue upload migration jobs in batch' do |batch:|
+  def run(task)
+    args = [uploader_class.to_s, model_class.to_s, mounted_as].compact
+    run_rake_task(task, *args)
+  end
+
+  it 'migrates local storage to remote object storage' do
+    expect(ObjectStorage::MigrateUploadsWorker)
+      .to receive(:perform_async).exactly(batch).times
+      .and_return("A fake job.")
+
+    run('gitlab:uploads:migrate')
+  end
+
+  it 'migrates remote object storage to local storage' do
+    expect(Upload).to receive(:where).exactly(batch + 1).times { Upload.all }
+    expect(ObjectStorage::MigrateUploadsWorker)
+      .to receive(:perform_async)
+      .with(anything, model_class.name, mounted_as, ObjectStorage::Store::LOCAL)
+      .exactly(batch).times
+      .and_return("A fake job.")
+
+    run('gitlab:uploads:migrate_to_local')
+  end
+end

spec/support/shared_examples/uploaders/workers/object_storage/migrate_uploads_shared_examples.rb

+# frozen_string_literal: true
+
+# Expects the calling spec to define:
+# - model_class
+# - mounted_as
+# - to_store
+RSpec.shared_examples 'uploads migration worker' do
+  def perform(uploads, store = nil)
+    described_class.new.perform(uploads.ids, model_class.to_s, mounted_as, store || to_store)
+  rescue ObjectStorage::MigrateUploadsWorker::Report::MigrationFailures
+    # swallow
+  end
+
+  describe '.enqueue!' do
+    def enqueue!
+      described_class.enqueue!(uploads, model_class, mounted_as, to_store)
+    end
+
+    it 'is guarded by .sanity_check!' do
+      expect(described_class).to receive(:perform_async)
+      expect(described_class).to receive(:sanity_check!)
+
+      enqueue!
+    end
+
+    context 'sanity_check! fails' do
+      include_context 'sanity_check! fails'
+
+      it 'does not enqueue a job' do
+        expect(described_class).not_to receive(:perform_async)
+
+        expect { enqueue! }.to raise_error(described_class::SanityCheckError)
+      end
+    end
+  end
+
+  describe '.sanity_check!' do
+    shared_examples 'raises a SanityCheckError' do |expected_message|
+      let(:mount_point) { nil }
+
+      it do
+        expect { described_class.sanity_check!(uploads, model_class, mount_point) }
+          .to raise_error(described_class::SanityCheckError).with_message(expected_message)
+      end
+    end
+
+    context 'uploader types mismatch' do
+      let!(:outlier) { create(:upload, uploader: 'GitlabUploader') }
+
+      include_examples 'raises a SanityCheckError', /Multiple uploaders found/
+    end
+
+    context 'mount point not found' do
+      include_examples 'raises a SanityCheckError', /Mount point [a-z:]+ not found in/ do
+        let(:mount_point) { :potato }
+      end
+    end
+  end
+
+  describe '#perform' do
+    shared_examples 'outputs correctly' do |success: 0, failures: 0|
+      total = success + failures
+
+      if success > 0
+        it 'outputs the reports' do
+          expect(Rails.logger).to receive(:info).with(%r{Migrated #{success}/#{total} files})
+
+          perform(uploads)
+        end
+      end
+
+      if failures > 0
+        it 'outputs upload failures' do
+          expect(Rails.logger).to receive(:warn).with(/Error .* I am a teapot/)
+
+          perform(uploads)
+        end
+      end
+    end
+
+    it_behaves_like 'outputs correctly', success: 10
+
+    it 'migrates files to remote storage' do
+      perform(uploads)
+
+      expect(Upload.where(store: ObjectStorage::Store::LOCAL).count).to eq(0)
+    end
+
+    context 'reversed' do
+      let(:to_store) { ObjectStorage::Store::LOCAL }
+
+      before do
+        perform(uploads, ObjectStorage::Store::REMOTE)
+      end
+
+      it 'migrates files to local storage' do
+        expect(Upload.where(store: ObjectStorage::Store::REMOTE).count).to eq(10)
+
+        perform(uploads)
+
+        expect(Upload.where(store: ObjectStorage::Store::LOCAL).count).to eq(10)
+      end
+    end
+
+    context 'migration is unsuccessful' do
+      before do
+        allow_any_instance_of(ObjectStorage::Concern)
+          .to receive(:migrate!).and_raise(CarrierWave::UploadError, 'I am a teapot.')
+      end
+
+      it_behaves_like 'outputs correctly', failures: 10
+    end
+  end
+end
+
+RSpec.shared_context 'sanity_check! fails' do
+  before do
+    expect(described_class).to receive(:sanity_check!).and_raise(described_class::SanityCheckError)
+  end
+end

spec/tasks/gitlab/uploads/migrate_rake_spec.rb

@@ -16,32 +16,6 @@ describe 'gitlab:uploads:migrate and migrate_to_local rake tasks' do
     allow(ObjectStorage::MigrateUploadsWorker).to receive(:perform_async)
   end
-  def run(task)
-    args = [uploader_class.to_s, model_class.to_s, mounted_as].compact
-    run_rake_task(task, *args)
-  end
-
-  shared_examples 'enqueue jobs in batch' do |batch:|
-    it 'migrates local storage to remote object storage' do
-      expect(ObjectStorage::MigrateUploadsWorker)
-        .to receive(:perform_async).exactly(batch).times
-        .and_return("A fake job.")
-
-      run('gitlab:uploads:migrate')
-    end
-
-    it 'migrates remote object storage to local storage' do
-      expect(Upload).to receive(:where).exactly(batch + 1).times { Upload.all }
-      expect(ObjectStorage::MigrateUploadsWorker)
-        .to receive(:perform_async)
-        .with(anything, model_class.name, mounted_as, ObjectStorage::Store::LOCAL)
-        .exactly(batch).times
-        .and_return("A fake job.")
-
-      run('gitlab:uploads:migrate_to_local')
-    end
-  end
-
   context "for AvatarUploader" do
     let(:uploader_class) { AvatarUploader }
     let(:mounted_as) { :avatar }
@@ -50,7 +24,7 @@ describe 'gitlab:uploads:migrate and migrate_to_local rake tasks' do
       let(:model_class) { Project }
       let!(:projects) { create_list(:project, 10, :with_avatar) }
-      it_behaves_like 'enqueue jobs in batch', batch: 4
+      it_behaves_like 'enqueue upload migration jobs in batch', batch: 4
     end
     context "for Group" do
@@ -60,7 +34,7 @@ describe 'gitlab:uploads:migrate and migrate_to_local rake tasks' do
         create_list(:group, 10, :with_avatar)
       end
-      it_behaves_like 'enqueue jobs in batch', batch: 4
+      it_behaves_like 'enqueue upload migration jobs in batch', batch: 4
     end
     context "for User" do
@@ -70,7 +44,7 @@ describe 'gitlab:uploads:migrate and migrate_to_local rake tasks' do
         create_list(:user, 10, :with_avatar)
       end
-      it_behaves_like 'enqueue jobs in batch', batch: 4
+      it_behaves_like 'enqueue upload migration jobs in batch', batch: 4
     end
   end
@@ -85,7 +59,7 @@ describe 'gitlab:uploads:migrate and migrate_to_local rake tasks' do
         create_list(:note, 10, :with_attachment)
       end
-      it_behaves_like 'enqueue jobs in batch', batch: 4
+      it_behaves_like 'enqueue upload migration jobs in batch', batch: 4
     end
     context "for Appearance" do
@@ -97,7 +71,7 @@ describe 'gitlab:uploads:migrate and migrate_to_local rake tasks' do
       end
       %i(logo header_logo).each do |mount|
-        it_behaves_like 'enqueue jobs in batch', batch: 1 do
+        it_behaves_like 'enqueue upload migration jobs in batch', batch: 1 do
           let(:mounted_as) { mount }
         end
       end
@@ -115,7 +89,7 @@ describe 'gitlab:uploads:migrate and migrate_to_local rake tasks' do
       end
     end
-    it_behaves_like 'enqueue jobs in batch', batch: 4
+    it_behaves_like 'enqueue upload migration jobs in batch', batch: 4
   end
   context "for PersonalFileUploader" do
@@ -129,7 +103,7 @@ describe 'gitlab:uploads:migrate and migrate_to_local rake tasks' do
       end
     end
-    it_behaves_like 'enqueue jobs in batch', batch: 4
+    it_behaves_like 'enqueue upload migration jobs in batch', batch: 4
   end
   context "for NamespaceFileUploader" do
@@ -143,6 +117,6 @@ describe 'gitlab:uploads:migrate and migrate_to_local rake tasks' do
       end
     end
-    it_behaves_like 'enqueue jobs in batch', batch: 4
+    it_behaves_like 'enqueue upload migration jobs in batch', batch: 4
   end
 end

spec/uploaders/workers/object_storage/migrate_uploads_worker_spec.rb

@@ -3,12 +3,6 @@
 require 'spec_helper'
 describe ObjectStorage::MigrateUploadsWorker do
-  shared_context 'sanity_check! fails' do
-    before do
-      expect(described_class).to receive(:sanity_check!).and_raise(described_class::SanityCheckError)
-    end
-  end
-
   let(:model_class) { Project }
   let(:uploads) { Upload.all }
   let(:to_store) { ObjectStorage::Store::REMOTE }
@@ -19,109 +13,6 @@ describe ObjectStorage::MigrateUploadsWorker do
     # swallow
   end
-  shared_examples "uploads migration worker" do
-    describe '.enqueue!' do
-      def enqueue!
-        described_class.enqueue!(uploads, Project, mounted_as, to_store)
-      end
-
-      it 'is guarded by .sanity_check!' do
-        expect(described_class).to receive(:perform_async)
-        expect(described_class).to receive(:sanity_check!)
-
-        enqueue!
-      end
-
-      context 'sanity_check! fails' do
-        include_context 'sanity_check! fails'
-
-        it 'does not enqueue a job' do
-          expect(described_class).not_to receive(:perform_async)
-
-          expect { enqueue! }.to raise_error(described_class::SanityCheckError)
-        end
-      end
-    end
-
-    describe '.sanity_check!' do
-      shared_examples 'raises a SanityCheckError' do |expected_message|
-        let(:mount_point) { nil }
-
-        it do
-          expect { described_class.sanity_check!(uploads, model_class, mount_point) }
-            .to raise_error(described_class::SanityCheckError).with_message(expected_message)
-        end
-      end
-
-      context 'uploader types mismatch' do
-        let!(:outlier) { create(:upload, uploader: 'GitlabUploader') }
-
-        include_examples 'raises a SanityCheckError', /Multiple uploaders found/
-      end
-
-      context 'mount point not found' do
-        include_examples 'raises a SanityCheckError', /Mount point [a-z:]+ not found in/ do
-          let(:mount_point) { :potato }
-        end
-      end
-    end
-
-    describe '#perform' do
-      shared_examples 'outputs correctly' do |success: 0, failures: 0|
-        total = success + failures
-
-        if success > 0
-          it 'outputs the reports' do
-            expect(Rails.logger).to receive(:info).with(%r{Migrated #{success}/#{total} files})
-
-            perform(uploads)
-          end
-        end
-
-        if failures > 0
-          it 'outputs upload failures' do
-            expect(Rails.logger).to receive(:warn).with(/Error .* I am a teapot/)
-
-            perform(uploads)
-          end
-        end
-      end
-
-      it_behaves_like 'outputs correctly', success: 10
-
-      it 'migrates files to remote storage' do
-        perform(uploads)
-
-        expect(Upload.where(store: ObjectStorage::Store::LOCAL).count).to eq(0)
-      end
-
-      context 'reversed' do
-        let(:to_store) { ObjectStorage::Store::LOCAL }
-
-        before do
-          perform(uploads, ObjectStorage::Store::REMOTE)
-        end
-
-        it 'migrates files to local storage' do
-          expect(Upload.where(store: ObjectStorage::Store::REMOTE).count).to eq(10)
-
-          perform(uploads)
-
-          expect(Upload.where(store: ObjectStorage::Store::LOCAL).count).to eq(10)
-        end
-      end
-
-      context 'migration is unsuccessful' do
-        before do
-          allow_any_instance_of(ObjectStorage::Concern)
-            .to receive(:migrate!).and_raise(CarrierWave::UploadError, "I am a teapot.")
-        end
-
-        it_behaves_like 'outputs correctly', failures: 10
-      end
-    end
-  end
-
   context "for AvatarUploader" do
     let!(:projects) { create_list(:project, 10, :with_avatar) }
     let(:mounted_as) { :avatar }

spec/views/admin/application_settings/integrations.html.haml_spec.rb

@@ -11,6 +11,7 @@ describe 'admin/application_settings/integrations.html.haml' do
     before do
       assign(:application_setting, app_settings)
       allow(Gitlab::Sourcegraph).to receive(:feature_available?).and_return(sourcegraph_flag)
+      allow(License).to receive(:feature_available?).with(:elastic_search).and_return(false) if defined?(License)
     end
     context 'when sourcegraph feature is enabled' do