Add latest changes from gitlab-org/gitlab@master

7 files changed, 228 insertions, 4 deletions

diff --git a/spec/lib/gitlab/background_migration/backfill_project_import_level_spec.rb b/spec/lib/gitlab/background_migration/backfill_project_import_level_spec.rb
new file mode 100644
index 00000000000..ae296483166
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/backfill_project_import_level_spec.rb
@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+# rubocop:disable Layout/HashAlignment
+RSpec.describe Gitlab::BackgroundMigration::BackfillProjectImportLevel do
+  let(:migration) do
+    described_class.new(
+      start_id:         table(:namespaces).minimum(:id),
+      end_id:           table(:namespaces).maximum(:id),
+      batch_table:      :namespaces,
+      batch_column:     :id,
+      sub_batch_size:   2,
+      pause_ms:         0,
+      connection:       ApplicationRecord.connection
+    )
+  end
+  # rubocop:enable Layout/HashAlignment
+
+  let(:namespaces_table) { table(:namespaces) }
+  let(:namespace_settings_table) { table(:namespace_settings) }
+
+  let!(:user_namespace) do
+    namespaces_table.create!(
+      name: 'user_namespace',
+      path: 'user_namespace',
+      type: 'User',
+      project_creation_level: 100
+    )
+  end
+
+  let!(:group_namespace_nil) do
+    namespaces_table.create!(
+      name: 'group_namespace_nil',
+      path: 'group_namespace_nil',
+      type: 'Group',
+      project_creation_level: nil
+    )
+  end
+
+  let!(:group_namespace_0) do
+    namespaces_table.create!(
+      name: 'group_namespace_0',
+      path: 'group_namespace_0',
+      type: 'Group',
+      project_creation_level: 0
+    )
+  end
+
+  let!(:group_namespace_1) do
+    namespaces_table.create!(
+      name: 'group_namespace_1',
+      path: 'group_namespace_1',
+      type: 'Group',
+      project_creation_level: 1
+    )
+  end
+
+  let!(:group_namespace_2) do
+    namespaces_table.create!(
+      name: 'group_namespace_2',
+      path: 'group_namespace_2',
+      type: 'Group',
+      project_creation_level: 2
+    )
+  end
+
+  let!(:group_namespace_9999) do
+    namespaces_table.create!(
+      name: 'group_namespace_9999',
+      path: 'group_namespace_9999',
+      type: 'Group',
+      project_creation_level: 9999
+    )
+  end
+
+  subject(:perform_migration) { migration.perform }
+
+  before do
+    namespace_settings_table.create!(namespace_id: user_namespace.id)
+    namespace_settings_table.create!(namespace_id: group_namespace_nil.id)
+    namespace_settings_table.create!(namespace_id: group_namespace_0.id)
+    namespace_settings_table.create!(namespace_id: group_namespace_1.id)
+    namespace_settings_table.create!(namespace_id: group_namespace_2.id)
+    namespace_settings_table.create!(namespace_id: group_namespace_9999.id)
+  end
+
+  describe 'Groups' do
+    using RSpec::Parameterized::TableSyntax
+
+    where(:namespace_id, :prev_level, :new_level) do
+      lazy { group_namespace_0.id }   | ::Gitlab::Access::OWNER | ::Gitlab::Access::NO_ACCESS
+      lazy { group_namespace_1.id }   | ::Gitlab::Access::OWNER | ::Gitlab::Access::MAINTAINER
+      lazy { group_namespace_2.id }   | ::Gitlab::Access::OWNER | ::Gitlab::Access::DEVELOPER
+    end
+
+    with_them do
+      it 'backfills the correct project_import_level of Group namespaces' do
+        expect { perform_migration }
+          .to change { namespace_settings_table.find_by(namespace_id: namespace_id).project_import_level }
+          .from(prev_level).to(new_level)
+      end
+    end
+
+    it 'does not update `User` namespaces or values outside range' do
+      expect { perform_migration }
+        .not_to change { namespace_settings_table.find_by(namespace_id: user_namespace.id).project_import_level }
+
+      expect { perform_migration }
+        .not_to change { namespace_settings_table.find_by(namespace_id: group_namespace_9999.id).project_import_level }
+    end
+
+    it 'maintains default import_level if creation_level is nil' do
+      project_import_level = namespace_settings_table.find_by(namespace_id: group_namespace_nil.id).project_import_level
+
+      expect { perform_migration }
+        .not_to change { project_import_level }
+
+      expect(project_import_level).to eq(::Gitlab::Access::OWNER)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/ci/build/artifacts/adapters/zip_stream_spec.rb b/spec/lib/gitlab/ci/build/artifacts/adapters/zip_stream_spec.rb
new file mode 100644
index 00000000000..2c236ba3726
--- /dev/null
+++ b/spec/lib/gitlab/ci/build/artifacts/adapters/zip_stream_spec.rb
@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Ci::Build::Artifacts::Adapters::ZipStream do
+  let(:file_name) { 'single_file.zip' }
+  let(:fixture_path) { "lib/gitlab/ci/build/artifacts/adapters/zip_stream/#{file_name}" }
+  let(:stream) { File.open(expand_fixture_path(fixture_path), 'rb') }
+
+  describe '#initialize' do
+    it 'initializes when stream is passed' do
+      expect { described_class.new(stream) }.not_to raise_error
+    end
+
+    context 'when stream is not passed' do
+      let(:stream) { nil }
+
+      it 'raises an error' do
+        expect { described_class.new(stream) }.to raise_error(described_class::InvalidStreamError)
+      end
+    end
+  end
+
+  describe '#each_blob' do
+    let(:adapter) { described_class.new(stream) }
+
+    context 'when stream is a zip file' do
+      it 'iterates file content when zip file contains one file' do
+        expect { |b| adapter.each_blob(&b) }
+          .to yield_with_args("file 1 content\n")
+      end
+
+      context 'when zip file contains multiple files' do
+        let(:file_name) { 'multiple_files.zip' }
+
+        it 'iterates content of all files' do
+          expect { |b| adapter.each_blob(&b) }
+            .to yield_successive_args("file 1 content\n", "file 2 content\n")
+        end
+      end
+
+      context 'when zip file includes files in a directory' do
+        let(:file_name) { 'with_directory.zip' }
+
+        it 'iterates contents from files only' do
+          expect { |b| adapter.each_blob(&b) }
+            .to yield_successive_args("file 1 content\n", "file 2 content\n")
+        end
+      end
+
+      context 'when zip contains a file which decompresses beyond the size limit' do
+        let(:file_name) { '200_mb_decompressed.zip' }
+
+        it 'does not read the file' do
+          expect { |b| adapter.each_blob(&b) }.not_to yield_control
+        end
+      end
+
+      context 'when the zip contains too many files' do
+        let(:file_name) { '100_files.zip' }
+
+        it 'stops processing when the limit is reached' do
+          expect { |b| adapter.each_blob(&b) }
+            .to yield_control.exactly(described_class::MAX_FILES_PROCESSED).times
+        end
+      end
+
+      context 'when stream is a zipbomb' do
+        let(:file_name) { 'zipbomb.zip' }
+
+        it 'does not read the file' do
+          expect { |b| adapter.each_blob(&b) }.not_to yield_control
+        end
+      end
+    end
+
+    context 'when stream is not a zip file' do
+      let(:stream) { File.open(expand_fixture_path('junit/junit.xml.gz'), 'rb') }
+
+      it 'does not yield any data' do
+        expect { |b| adapter.each_blob(&b) }.not_to yield_control
+        expect { adapter.each_blob { |b| b } }.not_to raise_error
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 4ffde842819..0d03f30a6d2 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -653,6 +653,7 @@ search_data:
 merge_request_assignees:
 - merge_request
 - assignee
+- updated_state_by
 lfs_file_locks:
 - user
 project_badges:
diff --git a/spec/lib/gitlab/import_export/base/relation_object_saver_spec.rb b/spec/lib/gitlab/import_export/base/relation_object_saver_spec.rb
index 7c84b9604a6..9f1b15aa049 100644
--- a/spec/lib/gitlab/import_export/base/relation_object_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/base/relation_object_saver_spec.rb
@@ -58,8 +58,8 @@ RSpec.describe Gitlab::ImportExport::Base::RelationObjectSaver do
     end
 
     context 'when subrelation collection count is small' do
-      let(:notes) { build_list(:note, 2, project: project, importing: true) }
-      let(:relation_object) { build(:issue, project: project, notes: notes) }
+      let(:note) { build(:note, project: project, importing: true) }
+      let(:relation_object) { build(:issue, project: project, notes: [note]) }
       let(:relation_definition) { { 'notes' => {} } }
 
       it 'saves subrelation as part of the relation object itself' do
@@ -68,7 +68,7 @@ RSpec.describe Gitlab::ImportExport::Base::RelationObjectSaver do
         saver.execute
 
         issue = project.issues.last
-        expect(issue.notes.count).to eq(2)
+        expect(issue.notes.count).to eq(1)
       end
     end
 
diff --git a/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
index a5e8a9cb58a..723f7e441f9 100644
--- a/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
@@ -254,6 +254,11 @@ RSpec.describe Gitlab::ImportExport::Project::TreeRestorer do
           end
         end
 
+        it 'has multiple merge request assignees' do
+          expect(MergeRequest.find_by(title: 'MR1').assignees).to contain_exactly(@user, *@existing_members)
+          expect(MergeRequest.find_by(title: 'MR2').assignees).to be_empty
+        end
+
         it 'has labels associated to label links, associated to issues' do
           expect(Label.first.label_links.first.target).not_to be_nil
         end
diff --git a/spec/lib/gitlab/import_export/project/tree_saver_spec.rb b/spec/lib/gitlab/import_export/project/tree_saver_spec.rb
index a248a04a5a0..edf645c403d 100644
--- a/spec/lib/gitlab/import_export/project/tree_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/project/tree_saver_spec.rb
@@ -103,6 +103,13 @@ RSpec.describe Gitlab::ImportExport::Project::TreeSaver do
         it 'has merge request resource label events' do
           expect(subject.first['resource_label_events']).not_to be_empty
         end
+
+        it 'has merge request assignees' do
+          reviewer = subject.first['merge_request_assignees'].first
+
+          expect(reviewer).not_to be_nil
+          expect(reviewer['user_id']).to eq(user.id)
+        end
       end
 
       context 'with snippets' do
@@ -468,7 +475,7 @@ RSpec.describe Gitlab::ImportExport::Project::TreeSaver do
     create(:label_link, label: group_label, target: issue)
     create(:label_priority, label: group_label, priority: 1)
     milestone = create(:milestone, project: project)
-    merge_request = create(:merge_request, source_project: project, milestone: milestone)
+    merge_request = create(:merge_request, source_project: project, milestone: milestone, assignees: [user])
 
     ci_build = create(:ci_build, project: project, when: nil)
     ci_build.pipeline.update!(project: project)
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 3ebed1096e3..1078d4587f7 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -741,6 +741,8 @@ MergeRequestAssignee:
 - id
 - user_id
 - merge_request_id
+- created_at
+- state
 ProjectMetricsSetting:
 - project_id
 - external_dashboard_url