From b7c735c8ac11b8182807070fc6f84f2606e15427 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 15 Apr 2020 12:09:18 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 spec/lib/gitlab/import_export/all_models.yml                | 4 ++++
 spec/lib/gitlab/import_export/project/tree_restorer_spec.rb | 3 ++-
 spec/lib/gitlab/import_export/project/tree_saver_spec.rb    | 3 +--
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'spec/lib/gitlab/import_export')

diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 515d72add92..5d5e2fe2a33 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -58,6 +58,7 @@ notes:
 - system_note_metadata
 - note_diff_file
 - suggestions
+- diff_note_positions
 - review
 label_links:
 - target
@@ -134,6 +135,7 @@ merge_requests:
 - pipelines_for_merge_request
 - merge_request_assignees
 - suggestions
+- diff_note_positions
 - unresolved_notes
 - assignees
 - reviews
@@ -517,6 +519,8 @@ error_tracking_setting:
 - project
 suggestions:
 - note
+diff_note_positions:
+- note
 metrics_setting:
 - project
 protected_environments:
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 1eac580bc5e..80ae9a08257 100644
--- a/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
@@ -25,7 +25,7 @@ describe Gitlab::ImportExport::Project::TreeRestorer, quarantine: { flaky: 'http
           @project = create(:project, :builds_enabled, :issues_disabled, name: 'project', path: 'project')
           @shared = @project.import_export_shared
 
-          allow(Feature).to receive(:enabled?).and_call_original
+          allow(Feature).to receive(:enabled?) { true }
           stub_feature_flags(project_import_ndjson: ndjson_enabled)
 
           setup_import_export_config('complex')
@@ -34,6 +34,7 @@ describe Gitlab::ImportExport::Project::TreeRestorer, quarantine: { flaky: 'http
           allow_any_instance_of(Repository).to receive(:fetch_source_branch!).and_return(true)
           allow_any_instance_of(Gitlab::Git::Repository).to receive(:branch_exists?).and_return(false)
 
+          expect(@shared).not_to receive(:error)
           expect_any_instance_of(Gitlab::Git::Repository).to receive(:create_branch).with('feature', 'DCBA')
           allow_any_instance_of(Gitlab::Git::Repository).to receive(:create_branch)
 
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 ded57b1d576..8adc360026d 100644
--- a/spec/lib/gitlab/import_export/project/tree_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/project/tree_saver_spec.rb
@@ -29,12 +29,11 @@ describe Gitlab::ImportExport::Project::TreeSaver do
 
       before_all do
         RSpec::Mocks.with_temporary_scope do
-          allow(Feature).to receive(:enabled?).and_call_original
+          allow(Feature).to receive(:enabled?) { true }
           stub_feature_flags(project_export_as_ndjson: ndjson_enabled)
 
           project.add_maintainer(user)
 
-          stub_feature_flags(project_export_as_ndjson: ndjson_enabled)
           project_tree_saver = described_class.new(project: project, current_user: user, shared: shared)
 
           project_tree_saver.save
-- 
cgit v1.2.3