WIP - added missing notes, trying to fix specs

3 files changed, 28 insertions, 5 deletions

diff --git a/app/models/ci/commit.rb b/app/models/ci/commit.rb
index f22b573a94c..98d67b7448a 100644
--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
@@ -179,5 +179,9 @@ module Ci
       self.yaml_errors = error
       update_state
     end
+
+    def notes
+      Note.for_commit_id(valid_commit_sha)
+    end
   end
 end
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index a2b8ea24bcf..ee8fc544b60 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -5,7 +5,9 @@ project_tree:
         :author
   - :labels
   - :milestones
-  - :snippets
+  - snippets:
+    - notes:
+        :author
   - :releases
   - :events
   - project_members:
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..c8505aa6be5 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
@@ -96,6 +100,10 @@ describe Gitlab::ImportExport::ProjectTreeSaver, services: true do
       it 'has ci commits' do
         expect(saved_project_json['ci_commits']).not_to be_empty
       end
+
+      it 'has ci commits notes' do
+        expect(saved_project_json['ci_commits'].first['notes']).not_to be_empty
+      end
     end
   end
 
@@ -115,11 +123,20 @@ 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_commit = create(:ci_commit,
+                       project: project,
+                       sha: merge_request.last_commit.id,
+                       ref: merge_request.source_branch,
+                       statuses: [commit_status])
+
+    create(:ci_build, commit: ci_commit, 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: ci_commit, project: project)
+    create(:note, noteable: snippet, project: project)
     project
   end