1 files changed, 30 insertions, 10 deletions
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 1c55d0e33c1..6e6adfd60eb 100644
--- a/spec/lib/gitlab/import_export/project_tree_saver_spec.rb
+++ b/spec/lib/gitlab/import_export/project_tree_saver_spec.rb
@@ -53,6 +53,10 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
         expect(saved_project_json['snippets']).not_to be_empty
       end
 
+      it 'has snippet notes' do
+        expect(saved_project_json['snippets'].first['notes']).not_to be_empty
+      end
+
       it 'has releases' do
         expect(saved_project_json['releases']).not_to be_empty
       end
@@ -85,16 +89,20 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
         expect(saved_project_json['merge_requests'].first['notes'].first['author']).not_to be_empty
       end
 
-      it 'has commit statuses' do
-        expect(saved_project_json['ci_commits'].first['statuses']).not_to be_empty
+      it 'has pipeline statuses' do
+        expect(saved_project_json['pipelines'].first['statuses']).not_to be_empty
+      end
+
+      it 'has pipeline builds' do
+        expect(saved_project_json['pipelines'].first['statuses'].first['type']).to eq('Ci::Build')
       end
 
-      it 'has CI builds' do
-        expect(saved_project_json['ci_commits'].first['statuses'].first['type']).to eq('Ci::Build')
+      it 'has pipeline commits' do
+        expect(saved_project_json['pipelines']).not_to be_empty
       end
 
-      it 'has ci commits' do
-        expect(saved_project_json['ci_commits']).not_to be_empty
+      it 'has ci pipeline notes' do
+        expect(saved_project_json['pipelines'].first['notes']).not_to be_empty
       end
     end
   end
@@ -115,11 +123,23 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
                      releases: [release]
                     )
 
-    ci_commit = create(:ci_commit, project: project, sha: merge_request.last_commit.id, ref: merge_request.source_branch)
-    create(:ci_build, commit: ci_commit)
+    commit_status = create(:commit_status, project: project)
+
+    ci_pipeline = create(:ci_pipeline,
+                       project: project,
+                       sha: merge_request.last_commit.id,
+                       ref: merge_request.source_branch,
+                       statuses: [commit_status])
+
+    create(:ci_build, pipeline: ci_pipeline, project: project)
     create(:milestone, project: project)
-    create(:note, noteable: issue)
-    create(:note, noteable: merge_request)
+    create(:note, noteable: issue, project: project)
+    create(:note, noteable: merge_request, project: project)
+    create(:note, noteable: snippet, project: project)
+    create(:note_on_commit,
+           author: user,
+           project: project,
+           commit_id: ci_pipeline.sha)
     project
   end