Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

3 files changed, 52 insertions, 1 deletions

diff --git a/spec/lib/gitlab/background_migration/backfill_snippet_repositories_spec.rb b/spec/lib/gitlab/background_migration/backfill_snippet_repositories_spec.rb
index 50e799908c6..dbf74bd9333 100644
--- a/spec/lib/gitlab/background_migration/backfill_snippet_repositories_spec.rb
+++ b/spec/lib/gitlab/background_migration/backfill_snippet_repositories_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::BackgroundMigration::BackfillSnippetRepositories, :migration, schema: 2020_04_20_094444 do
+RSpec.describe Gitlab::BackgroundMigration::BackfillSnippetRepositories, :migration, schema: 2021_03_13_045845 do
   let(:gitlab_shell) { Gitlab::Shell.new }
   let(:users) { table(:users) }
   let(:snippets) { table(:snippets) }
diff --git a/spec/lib/gitlab/background_migration/copy_column_using_background_migration_job_spec.rb b/spec/lib/gitlab/background_migration/copy_column_using_background_migration_job_spec.rb
index 7ad93c3124a..c4c0247ad3e 100644
--- a/spec/lib/gitlab/background_migration/copy_column_using_background_migration_job_spec.rb
+++ b/spec/lib/gitlab/background_migration/copy_column_using_background_migration_job_spec.rb
@@ -64,5 +64,13 @@ RSpec.describe Gitlab::BackgroundMigration::CopyColumnUsingBackgroundMigrationJo
       expect(test_table.where('name is NULL and name_convert_to_text is NULL').pluck(:id)).to contain_exactly(15)
       expect(test_table.where("name_convert_to_text = 'no name'").count).to eq(0)
     end
+
+    it 'tracks timings of queries' do
+      expect(subject.batch_metrics.timings).to be_empty
+
+      subject.perform(10, 20, table_name, 'id', sub_batch_size, 'name', 'name_convert_to_text')
+
+      expect(subject.batch_metrics.timings[:update_all]).not_to be_empty
+    end
   end
 end
diff --git a/spec/lib/gitlab/background_migration/migrate_pages_to_zip_storage_spec.rb b/spec/lib/gitlab/background_migration/migrate_pages_to_zip_storage_spec.rb
new file mode 100644
index 00000000000..557dd8ddee6
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/migrate_pages_to_zip_storage_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::MigratePagesToZipStorage do
+  let(:namespace) { create(:group) } # rubocop: disable RSpec/FactoriesInMigrationSpecs
+  let(:migration) { described_class.new }
+
+  describe '#perform' do
+    context 'when there is project to migrate' do
+      let!(:project) { create_project('project') }
+
+      after do
+        FileUtils.rm_rf(project.pages_path)
+      end
+
+      it 'migrates project to zip storage' do
+        expect_next_instance_of(::Pages::MigrateFromLegacyStorageService,
+                                anything,
+                                ignore_invalid_entries: false,
+                                mark_projects_as_not_deployed: false) do |service|
+          expect(service).to receive(:execute_for_batch).with(project.id..project.id).and_call_original
+        end
+
+        migration.perform(project.id, project.id)
+
+        expect(project.reload.pages_metadatum.pages_deployment.file.filename).to eq("_migrated.zip")
+      end
+    end
+  end
+
+  def create_project(path)
+    project = create(:project) # rubocop: disable RSpec/FactoriesInMigrationSpecs
+    project.mark_pages_as_deployed
+
+    FileUtils.mkdir_p File.join(project.pages_path, "public")
+    File.open(File.join(project.pages_path, "public/index.html"), "w") do |f|
+      f.write("Hello!")
+    end
+
+    project
+  end
+end