Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

13 files changed, 276 insertions, 143 deletions

diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 3126d87a0d6..5ee7fb2adbf 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -30,6 +30,7 @@ issues:
 - metrics
 - timelogs
 - issuable_severity
+- issuable_sla
 - issue_assignees
 - closed_by
 - epic_issue
@@ -51,6 +52,7 @@ issues:
 - status_page_published_incident
 - namespace
 - note_authors
+- issue_email_participants
 events:
 - author
 - project
@@ -158,6 +160,8 @@ merge_requests:
 - assignees
 - reviews
 - approval_rules
+- approval_merge_request_rule_sources
+- approval_project_rules
 - approvals
 - approvers
 - approver_users
@@ -242,6 +246,7 @@ ci_pipelines:
 - latest_builds_report_results
 - messages
 - pipeline_artifacts
+- latest_statuses
 ci_refs:
 - project
 - ci_pipelines
@@ -300,6 +305,7 @@ protected_branches:
 - push_access_levels
 - unprotect_access_levels
 - approval_project_rules
+- required_code_owners_sections
 protected_tags:
 - project
 - create_access_levels
@@ -408,6 +414,7 @@ project:
 - stages
 - ci_refs
 - builds
+- processables
 - runner_projects
 - runners
 - variables
@@ -465,6 +472,8 @@ project:
 - feature_usage
 - approval_rules
 - approval_merge_request_rules
+- approval_merge_request_rule_sources
+- approval_project_rules
 - approvers
 - approver_users
 - audit_events
@@ -536,6 +545,8 @@ project:
 - vulnerability_historical_statistics
 - product_analytics_events
 - pipeline_artifacts
+- terraform_states
+- alert_management_http_integrations
 award_emoji:
 - awardable
 - user
@@ -703,3 +714,5 @@ system_note_metadata:
 - description_version
 status_page_published_incident:
 - issue
+issuable_sla:
+  - issue
diff --git a/spec/lib/gitlab/import_export/fast_hash_serializer_spec.rb b/spec/lib/gitlab/import_export/fast_hash_serializer_spec.rb
index 93b6f93f0ec..d084b9d7f7e 100644
--- a/spec/lib/gitlab/import_export/fast_hash_serializer_spec.rb
+++ b/spec/lib/gitlab/import_export/fast_hash_serializer_spec.rb
@@ -10,14 +10,17 @@ RSpec.describe Gitlab::ImportExport::FastHashSerializer do
   # all items are properly serialized while traversing the simple hash.
   subject { Gitlab::Json.parse(Gitlab::Json.generate(described_class.new(project, tree).execute)) }
 
-  let!(:project) { setup_project }
-  let(:user) { create(:user) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { setup_project }
   let(:shared) { project.import_export_shared }
   let(:reader) { Gitlab::ImportExport::Reader.new(shared: shared) }
   let(:tree) { reader.project_tree }
 
-  before do
+  before_all do
     project.add_maintainer(user)
+  end
+
+  before do
     allow_any_instance_of(MergeRequest).to receive(:source_branch_sha).and_return('ABCD')
     allow_any_instance_of(MergeRequest).to receive(:target_branch_sha).and_return('DCBA')
   end
@@ -224,7 +227,6 @@ RSpec.describe Gitlab::ImportExport::FastHashSerializer do
                      group: group,
                      approvals_before_merge: 1
                     )
-    allow(project).to receive(:commit).and_return(Commit.new(RepoHelpers.sample_commit, project))
 
     issue = create(:issue, assignees: [user], project: project)
     snippet = create(:project_snippet, project: project)
diff --git a/spec/lib/gitlab/import_export/group/relation_factory_spec.rb b/spec/lib/gitlab/import_export/group/relation_factory_spec.rb
index eb9a3fa9bd8..6b2f80cc80a 100644
--- a/spec/lib/gitlab/import_export/group/relation_factory_spec.rb
+++ b/spec/lib/gitlab/import_export/group/relation_factory_spec.rb
@@ -5,16 +5,19 @@ require 'spec_helper'
 RSpec.describe Gitlab::ImportExport::Group::RelationFactory do
   let(:group) { create(:group) }
   let(:members_mapper) { double('members_mapper').as_null_object }
-  let(:user) { create(:admin) }
+  let(:admin) { create(:admin) }
+  let(:importer_user) { admin }
   let(:excluded_keys) { [] }
   let(:created_object) do
-    described_class.create(relation_sym:   relation_sym,
-                           relation_hash:  relation_hash,
-                           members_mapper: members_mapper,
-                           object_builder: Gitlab::ImportExport::Group::ObjectBuilder,
-                           user:           user,
-                           importable:     group,
-                           excluded_keys:  excluded_keys)
+    described_class.create(
+      relation_sym: relation_sym,
+      relation_hash: relation_hash,
+      members_mapper: members_mapper,
+      object_builder: Gitlab::ImportExport::Group::ObjectBuilder,
+      user: importer_user,
+      importable: group,
+      excluded_keys: excluded_keys
+    )
   end
 
   context 'label object' do
@@ -24,18 +27,18 @@ RSpec.describe Gitlab::ImportExport::Group::RelationFactory do
 
     let(:relation_hash) do
       {
-        'id'          => 123456,
-        'title'       => 'Bruffefunc',
-        'color'       => '#1d2da4',
-        'project_id'  => nil,
-        'created_at'  => '2019-11-20T17:02:20.546Z',
-        'updated_at'  => '2019-11-20T17:02:20.546Z',
-        'template'    => false,
+        'id' => 123456,
+        'title' => 'Bruffefunc',
+        'color' => '#1d2da4',
+        'project_id' => nil,
+        'created_at' => '2019-11-20T17:02:20.546Z',
+        'updated_at' => '2019-11-20T17:02:20.546Z',
+        'template' => false,
         'description' => 'Description',
-        'group_id'    => original_group_id,
-        'type'        => 'GroupLabel',
-        'priorities'  => [],
-        'textColor'   => '#FFFFFF'
+        'group_id' => original_group_id,
+        'type' => 'GroupLabel',
+        'priorities' => [],
+        'textColor' => '#FFFFFF'
       }
     end
 
@@ -60,58 +63,28 @@ RSpec.describe Gitlab::ImportExport::Group::RelationFactory do
     end
   end
 
-  context 'Notes user references' do
-    let(:relation_sym) { :notes }
-    let(:new_user) { create(:user) }
-    let(:exported_member) do
-      {
-        'id'                 => 111,
-        'access_level'       => 30,
-        'source_id'          => 1,
-        'source_type'        => 'Namespace',
-        'user_id'            => 3,
-        'notification_level' => 3,
-        'created_at'         => '2016-11-18T09:29:42.634Z',
-        'updated_at'         => '2016-11-18T09:29:42.634Z',
-        'user'               => {
-          'id'       => 999,
-          'email'    => new_user.email,
-          'username' => new_user.username
-        }
-      }
-    end
-
+  it_behaves_like 'Notes user references' do
+    let(:importable) { group }
     let(:relation_hash) do
       {
-        'id'            => 4947,
-        'note'          => 'note',
+        'id' => 4947,
+        'note' => 'note',
         'noteable_type' => 'Epic',
-        'author_id'     => 999,
-        'created_at'    => '2016-11-18T09:29:42.634Z',
-        'updated_at'    => '2016-11-18T09:29:42.634Z',
-        'project_id'    => 1,
-        'attachment'    => {
+        'author_id' => 999,
+        'created_at' => '2016-11-18T09:29:42.634Z',
+        'updated_at' => '2016-11-18T09:29:42.634Z',
+        'project_id' => 1,
+        'attachment' => {
           'url' => nil
         },
-        'noteable_id'   => 377,
-        'system'        => true,
-        'author'        => {
+        'noteable_id' => 377,
+        'system' => true,
+        'author' => {
           'name' => 'Administrator'
         },
         'events' => []
       }
     end
-
-    let(:members_mapper) do
-      Gitlab::ImportExport::MembersMapper.new(
-        exported_members: [exported_member],
-        user:             user,
-        importable:       group)
-    end
-
-    it 'maps the right author to the imported note' do
-      expect(created_object.author).to eq(new_user)
-    end
   end
 
   def random_id
diff --git a/spec/lib/gitlab/import_export/import_test_coverage_spec.rb b/spec/lib/gitlab/import_export/import_test_coverage_spec.rb
index 9737a0f39fc..7a9e7d8afba 100644
--- a/spec/lib/gitlab/import_export/import_test_coverage_spec.rb
+++ b/spec/lib/gitlab/import_export/import_test_coverage_spec.rb
@@ -23,6 +23,7 @@ RSpec.describe 'Test coverage of the Project Import' do
       project.issues.notes.events
       project.issues.notes.events.push_event_payload
       project.issues.milestone.events.push_event_payload
+      project.issues.issuable_sla
       project.issues.issue_milestones
       project.issues.issue_milestones.milestone
       project.issues.resource_label_events.label.priorities
diff --git a/spec/lib/gitlab/import_export/json/ndjson_reader_spec.rb b/spec/lib/gitlab/import_export/json/ndjson_reader_spec.rb
index a347d835428..e208a1c383c 100644
--- a/spec/lib/gitlab/import_export/json/ndjson_reader_spec.rb
+++ b/spec/lib/gitlab/import_export/json/ndjson_reader_spec.rb
@@ -102,4 +102,14 @@ RSpec.describe Gitlab::ImportExport::JSON::NdjsonReader do
       end
     end
   end
+
+  describe '#clear_consumed_relations' do
+    let(:dir_path) { fixture }
+
+    subject { ndjson_reader.clear_consumed_relations }
+
+    it 'returns empty set' do
+      expect(subject).to be_empty
+    end
+  end
 end
diff --git a/spec/lib/gitlab/import_export/lfs_saver_spec.rb b/spec/lib/gitlab/import_export/lfs_saver_spec.rb
index db76eb9538b..55b4f7479b8 100644
--- a/spec/lib/gitlab/import_export/lfs_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/lfs_saver_spec.rb
@@ -74,14 +74,6 @@ RSpec.describe Gitlab::ImportExport::LfsSaver do
             }
           )
         end
-
-        it 'does not save a json file if feature is disabled' do
-          stub_feature_flags(export_lfs_objects_projects: false)
-
-          saver.save
-
-          expect(File.exist?(lfs_json_file)).to eq(false)
-        end
       end
     end
 
diff --git a/spec/lib/gitlab/import_export/project/relation_factory_spec.rb b/spec/lib/gitlab/import_export/project/relation_factory_spec.rb
index 31cf2362628..50bc6a30044 100644
--- a/spec/lib/gitlab/import_export/project/relation_factory_spec.rb
+++ b/spec/lib/gitlab/import_export/project/relation_factory_spec.rb
@@ -3,19 +3,22 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::ImportExport::Project::RelationFactory do
-  let(:group)   { create(:group) }
+  let(:group) { create(:group) }
   let(:project) { create(:project, :repository, group: group) }
   let(:members_mapper) { double('members_mapper').as_null_object }
-  let(:user) { create(:admin) }
+  let(:admin) { create(:admin) }
+  let(:importer_user) { admin }
   let(:excluded_keys) { [] }
   let(:created_object) do
-    described_class.create(relation_sym: relation_sym,
-                           relation_hash: relation_hash,
-                           object_builder: Gitlab::ImportExport::Project::ObjectBuilder,
-                           members_mapper: members_mapper,
-                           user: user,
-                           importable: project,
-                           excluded_keys: excluded_keys)
+    described_class.create(
+      relation_sym: relation_sym,
+      relation_hash: relation_hash,
+      object_builder: Gitlab::ImportExport::Project::ObjectBuilder,
+      members_mapper: members_mapper,
+      user: importer_user,
+      importable: project,
+      excluded_keys: excluded_keys
+    )
   end
 
   before do
@@ -113,9 +116,9 @@ RSpec.describe Gitlab::ImportExport::Project::RelationFactory do
         "created_at" => "2016-11-18T09:29:42.634Z",
         "updated_at" => "2016-11-18T09:29:42.634Z",
         "user" => {
-          "id" => user.id,
-          "email" => user.email,
-          "username" => user.username
+          "id" => admin.id,
+          "email" => admin.email,
+          "username" => admin.username
         }
       }
     end
@@ -123,7 +126,7 @@ RSpec.describe Gitlab::ImportExport::Project::RelationFactory do
     let(:members_mapper) do
       Gitlab::ImportExport::MembersMapper.new(
         exported_members: [exported_member],
-        user: user,
+        user: importer_user,
         importable: project)
     end
 
@@ -134,9 +137,9 @@ RSpec.describe Gitlab::ImportExport::Project::RelationFactory do
         'source_branch' => "feature_conflict",
         'source_project_id' => project.id,
         'target_project_id' => project.id,
-        'author_id' => user.id,
-        'assignee_id' => user.id,
-        'updated_by_id' => user.id,
+        'author_id' => admin.id,
+        'assignee_id' => admin.id,
+        'updated_by_id' => admin.id,
         'title' => "MR1",
         'created_at' => "2016-06-14T15:02:36.568Z",
         'updated_at' => "2016-06-14T15:02:56.815Z",
@@ -151,11 +154,11 @@ RSpec.describe Gitlab::ImportExport::Project::RelationFactory do
     end
 
     it 'has preloaded author' do
-      expect(created_object.author).to equal(user)
+      expect(created_object.author).to equal(admin)
     end
 
     it 'has preloaded updated_by' do
-      expect(created_object.updated_by).to equal(user)
+      expect(created_object.updated_by).to equal(admin)
     end
 
     it 'has preloaded source project' do
@@ -264,27 +267,8 @@ RSpec.describe Gitlab::ImportExport::Project::RelationFactory do
     end
   end
 
-  context 'Notes user references' do
-    let(:relation_sym) { :notes }
-    let(:new_user) { create(:user) }
-    let(:exported_member) do
-      {
-        "id" => 111,
-        "access_level" => 30,
-        "source_id" => 1,
-        "source_type" => "Project",
-        "user_id" => 3,
-        "notification_level" => 3,
-        "created_at" => "2016-11-18T09:29:42.634Z",
-        "updated_at" => "2016-11-18T09:29:42.634Z",
-        "user" => {
-          "id" => 999,
-          "email" => new_user.email,
-          "username" => new_user.username
-        }
-      }
-    end
-
+  it_behaves_like 'Notes user references' do
+    let(:importable) { project }
     let(:relation_hash) do
       {
         "id" => 4947,
@@ -305,17 +289,6 @@ RSpec.describe Gitlab::ImportExport::Project::RelationFactory do
         "events" => []
       }
     end
-
-    let(:members_mapper) do
-      Gitlab::ImportExport::MembersMapper.new(
-        exported_members: [exported_member],
-        user: user,
-        importable: project)
-    end
-
-    it 'maps the right author to the imported note' do
-      expect(created_object.author).to eq(new_user)
-    end
   end
 
   context 'encrypted attributes' do
diff --git a/spec/lib/gitlab/import_export/project/sample/date_calculator_spec.rb b/spec/lib/gitlab/import_export/project/sample/date_calculator_spec.rb
new file mode 100644
index 00000000000..82f59245519
--- /dev/null
+++ b/spec/lib/gitlab/import_export/project/sample/date_calculator_spec.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::ImportExport::Project::Sample::DateCalculator do
+  describe '#closest date to average' do
+    subject { described_class.new(dates).closest_date_to_average }
+
+    context 'when dates are empty' do
+      let(:dates) { [] }
+
+      it { is_expected.to be_nil }
+    end
+
+    context 'when dates are not empty' do
+      let(:dates) { [[nil, '2020-01-01 00:00:00 +0000'], [nil, '2021-01-01 00:00:00 +0000'], [nil, '2022-01-01 23:59:59 +0000']] }
+
+      it { is_expected.to eq(Time.zone.parse('2021-01-01 00:00:00 +0000')) }
+    end
+  end
+
+  describe '#calculate_by_closest_date_to_average' do
+    let(:calculator) { described_class.new([]) }
+    let(:date) { Time.current }
+
+    subject { calculator.calculate_by_closest_date_to_average(date) }
+
+    context 'when average date is nil' do
+      before do
+        allow(calculator).to receive(:closest_date_to_average).and_return(nil)
+      end
+
+      it { is_expected.to eq(date) }
+    end
+
+    context 'when average date is in the past' do
+      before do
+        allow(calculator).to receive(:closest_date_to_average).and_return(date - 365.days)
+        allow(Time).to receive(:current).and_return(date)
+      end
+
+      it { is_expected.to eq(date + 365.days) }
+    end
+
+    context 'when average date is in the future' do
+      before do
+        allow(calculator).to receive(:closest_date_to_average).and_return(date + 10.days)
+      end
+
+      it { is_expected.to eq(date) }
+    end
+  end
+end
diff --git a/spec/lib/gitlab/import_export/project/sample/sample_data_relation_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project/sample/sample_data_relation_tree_restorer_spec.rb
new file mode 100644
index 00000000000..f173345a4c6
--- /dev/null
+++ b/spec/lib/gitlab/import_export/project/sample/sample_data_relation_tree_restorer_spec.rb
@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+# This spec is a lightweight version of:
+#   * project/tree_restorer_spec.rb
+#
+# In depth testing is being done in the above specs.
+# This spec tests that restore of the sample project works
+# but does not have 100% relation coverage.
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::ImportExport::Project::Sample::SampleDataRelationTreeRestorer do
+  include_context 'relation tree restorer shared context'
+
+  let(:sample_data_relation_tree_restorer) do
+    described_class.new(
+      user:                  user,
+      shared:                shared,
+      relation_reader:       relation_reader,
+      object_builder:        object_builder,
+      members_mapper:        members_mapper,
+      relation_factory:      relation_factory,
+      reader:                reader,
+      importable:            importable,
+      importable_path:       importable_path,
+      importable_attributes: attributes
+    )
+  end
+
+  subject { sample_data_relation_tree_restorer.restore }
+
+  shared_examples 'import project successfully' do
+    it 'restores project tree' do
+      expect(subject).to eq(true)
+    end
+
+    describe 'imported project' do
+      let(:project) { Project.find_by_path('project') }
+
+      before do
+        subject
+      end
+
+      it 'has the project attributes and relations', :aggregate_failures do
+        expect(project.description).to eq('Nisi et repellendus ut enim quo accusamus vel magnam.')
+        expect(project.issues.count).to eq(10)
+        expect(project.milestones.count).to eq(3)
+        expect(project.labels.count).to eq(2)
+        expect(project.project_feature).not_to be_nil
+      end
+
+      it 'has issues with correctly updated due dates' do
+        due_dates = due_dates(project.issues)
+
+        expect(due_dates).to match_array([Date.today - 7.days, Date.today, Date.today + 7.days])
+      end
+
+      it 'has milestones with correctly updated due dates' do
+        due_dates = due_dates(project.milestones)
+
+        expect(due_dates).to match_array([Date.today - 7.days, Date.today, Date.today + 7.days])
+      end
+
+      def due_dates(relations)
+        due_dates = relations.map { |relation| relation['due_date'] }
+        due_dates.compact!
+        due_dates.sort
+      end
+    end
+  end
+
+  context 'when restoring a project' do
+    let(:importable) { create(:project, :builds_enabled, :issues_disabled, name: 'project', path: 'project') }
+    let(:importable_name) { 'project' }
+    let(:importable_path) { 'project' }
+    let(:object_builder) { Gitlab::ImportExport::Project::ObjectBuilder }
+    let(:relation_factory) { Gitlab::ImportExport::Project::RelationFactory }
+    let(:reader) { Gitlab::ImportExport::Reader.new(shared: shared) }
+
+    context 'using ndjson reader' do
+      let(:path) { 'spec/fixtures/lib/gitlab/import_export/sample_data/tree' }
+      let(:relation_reader) { Gitlab::ImportExport::JSON::NdjsonReader.new(path) }
+
+      it_behaves_like 'import project successfully'
+    end
+  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 f75494aa7c7..c05968c9a85 100644
--- a/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
@@ -1040,6 +1040,41 @@ RSpec.describe Gitlab::ImportExport::Project::TreeRestorer do
     it_behaves_like 'project tree restorer work properly', :legacy_reader, true
 
     it_behaves_like 'project tree restorer work properly', :ndjson_reader, true
+
+    context 'Sample Data JSON' do
+      let(:user) { create(:user) }
+      let!(:project) { create(:project, :builds_disabled, :issues_disabled, name: 'project', path: 'project') }
+      let(:project_tree_restorer) { described_class.new(user: user, shared: shared, project: project) }
+
+      before do
+        setup_import_export_config('sample_data')
+        setup_reader(:ndjson_reader)
+      end
+
+      context 'with sample_data_template' do
+        before do
+          allow(project).to receive_message_chain(:import_data, :data, :dig).with('sample_data') { true }
+        end
+
+        it 'initialize SampleDataRelationTreeRestorer' do
+          expect_next_instance_of(Gitlab::ImportExport::Project::Sample::SampleDataRelationTreeRestorer) do |restorer|
+            expect(restorer).to receive(:restore).and_return(true)
+          end
+
+          expect(project_tree_restorer.restore).to eq(true)
+        end
+      end
+
+      context 'without sample_data_template' do
+        it 'initialize RelationTreeRestorer' do
+          expect_next_instance_of(Gitlab::ImportExport::RelationTreeRestorer) do |restorer|
+            expect(restorer).to receive(:restore).and_return(true)
+          end
+
+          expect(project_tree_restorer.restore).to eq(true)
+        end
+      end
+    end
   end
 
   context 'disable ndjson import' do
diff --git a/spec/lib/gitlab/import_export/relation_tree_restorer_spec.rb b/spec/lib/gitlab/import_export/relation_tree_restorer_spec.rb
index ddc96b83208..bd9ac6d6697 100644
--- a/spec/lib/gitlab/import_export/relation_tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/relation_tree_restorer_spec.rb
@@ -10,15 +10,7 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::ImportExport::RelationTreeRestorer do
-  include ImportExport::CommonUtil
-
-  let(:user) { create(:user) }
-  let(:shared) { Gitlab::ImportExport::Shared.new(importable) }
-  let(:attributes) { relation_reader.consume_attributes(importable_name) }
-
-  let(:members_mapper) do
-    Gitlab::ImportExport::MembersMapper.new(exported_members: {}, user: user, importable: importable)
-  end
+  include_context 'relation tree restorer shared context'
 
   let(:relation_tree_restorer) do
     described_class.new(
diff --git a/spec/lib/gitlab/import_export/repo_restorer_spec.rb b/spec/lib/gitlab/import_export/repo_restorer_spec.rb
index ace4449042e..b32ae60fbcc 100644
--- a/spec/lib/gitlab/import_export/repo_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/repo_restorer_spec.rb
@@ -36,21 +36,20 @@ RSpec.describe Gitlab::ImportExport::RepoRestorer do
       expect(subject.restore).to be_truthy
     end
 
-    context 'when the repository creation fails' do
-      before do
-        allow_next_instance_of(Repositories::DestroyService) do |instance|
+    context 'when the repository already exists' do
+      it 'deletes the existing repository before importing' do
+        allow(project.repository).to receive(:exists?).and_return(true)
+        allow(project.repository).to receive(:path).and_return('repository_path')
+
+        expect_next_instance_of(Repositories::DestroyService) do |instance|
           expect(instance).to receive(:execute).and_call_original
         end
-      end
-
-      it 'logs the error' do
-        allow(project.repository)
-          .to receive(:create_from_bundle)
-          .and_raise('9:CreateRepositoryFromBundle: target directory is non-empty')
 
-        expect(shared).to receive(:error).and_call_original
+        expect(shared.logger).to receive(:info).with(
+          message: 'Deleting existing "repository_path" to re-import it.'
+        )
 
-        expect(subject.restore).to be_falsey
+        expect(subject.restore).to be_truthy
       end
     end
   end
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 5ca7c5b7a91..e3d1f2c9368 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -855,3 +855,6 @@ ProjectSecuritySetting:
   - auto_fix_sast
   - created_at
   - updated_at
+IssuableSla:
+  - issue_id
+  - due_at