From 5370ec1c3d27d646be672039e78161d22b1e2a80 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 29 Jun 2022 14:16:15 +0000
Subject: Add latest changes from gitlab-org/security/gitlab@15-1-stable-ee

---
 .../projects/pipelines/project_pipeline_spec.rb    | 26 +++++++++++++++++++---
 .../project_attributes_transformer_spec.rb         | 21 ++++-------------
 2 files changed, 27 insertions(+), 20 deletions(-)

(limited to 'spec/lib/bulk_imports')

diff --git a/spec/lib/bulk_imports/projects/pipelines/project_pipeline_spec.rb b/spec/lib/bulk_imports/projects/pipelines/project_pipeline_spec.rb
index 567a0a4fcc3..c53c0849931 100644
--- a/spec/lib/bulk_imports/projects/pipelines/project_pipeline_spec.rb
+++ b/spec/lib/bulk_imports/projects/pipelines/project_pipeline_spec.rb
@@ -25,7 +25,18 @@ RSpec.describe BulkImports::Projects::Pipelines::ProjectPipeline do
     let(:project_data) do
       {
         'visibility' => 'private',
-        'created_at' => '2016-08-12T09:41:03'
+        'created_at' => 10.days.ago,
+        'archived' => false,
+        'shared_runners_enabled' => true,
+        'container_registry_enabled' => true,
+        'only_allow_merge_if_pipeline_succeeds' => true,
+        'only_allow_merge_if_all_discussions_are_resolved' => true,
+        'request_access_enabled' => true,
+        'printing_merge_request_link_enabled' => true,
+        'remove_source_branch_after_merge' => true,
+        'autoclose_referenced_issues' => true,
+        'suggestion_commit_message' => 'message',
+        'wiki_enabled' => true
       }
     end
 
@@ -47,8 +58,17 @@ RSpec.describe BulkImports::Projects::Pipelines::ProjectPipeline do
 
       expect(imported_project).not_to be_nil
       expect(imported_project.group).to eq(group)
-      expect(imported_project.visibility).to eq(project_data['visibility'])
-      expect(imported_project.created_at).to eq(project_data['created_at'])
+      expect(imported_project.suggestion_commit_message).to eq('message')
+      expect(imported_project.archived?).to eq(project_data['archived'])
+      expect(imported_project.shared_runners_enabled?).to eq(project_data['shared_runners_enabled'])
+      expect(imported_project.container_registry_enabled?).to eq(project_data['container_registry_enabled'])
+      expect(imported_project.only_allow_merge_if_pipeline_succeeds?).to eq(project_data['only_allow_merge_if_pipeline_succeeds'])
+      expect(imported_project.only_allow_merge_if_all_discussions_are_resolved?).to eq(project_data['only_allow_merge_if_all_discussions_are_resolved'])
+      expect(imported_project.request_access_enabled?).to eq(project_data['request_access_enabled'])
+      expect(imported_project.printing_merge_request_link_enabled?).to eq(project_data['printing_merge_request_link_enabled'])
+      expect(imported_project.remove_source_branch_after_merge?).to eq(project_data['remove_source_branch_after_merge'])
+      expect(imported_project.autoclose_referenced_issues?).to eq(project_data['autoclose_referenced_issues'])
+      expect(imported_project.wiki_enabled?).to eq(project_data['wiki_enabled'])
     end
   end
 
diff --git a/spec/lib/bulk_imports/projects/transformers/project_attributes_transformer_spec.rb b/spec/lib/bulk_imports/projects/transformers/project_attributes_transformer_spec.rb
index a1d77b9732d..822bb9a5605 100644
--- a/spec/lib/bulk_imports/projects/transformers/project_attributes_transformer_spec.rb
+++ b/spec/lib/bulk_imports/projects/transformers/project_attributes_transformer_spec.rb
@@ -25,8 +25,8 @@ RSpec.describe BulkImports::Projects::Transformers::ProjectAttributesTransformer
 
     let(:data) do
       {
-        'visibility' => 'private',
-        'created_at' => '2016-11-18T09:29:42.634Z'
+        'name' => 'source_name',
+        'visibility' => 'private'
       }
     end
 
@@ -76,21 +76,8 @@ RSpec.describe BulkImports::Projects::Transformers::ProjectAttributesTransformer
       end
     end
 
-    context 'when data has extra keys' do
-      it 'returns a fixed number of keys' do
-        data = {
-          'visibility' => 'private',
-          'created_at' => '2016-11-18T09:29:42.634Z',
-          'my_key' => 'my_key',
-          'another_key' => 'another_key',
-          'last_key' => 'last_key'
-        }
-
-        transformed_data = described_class.new.transform(context, data)
-
-        expect(transformed_data.keys)
-          .to contain_exactly(:created_at, :import_type, :name, :namespace_id, :path, :visibility_level)
-      end
+    it 'converts all keys to symbols' do
+      expect(transformed_data.keys).to contain_exactly(:name, :path, :import_type, :visibility_level, :namespace_id)
     end
   end
 end
-- 
cgit v1.2.3