diff options
author | Michael Kozono <mkozono@gmail.com> | 2019-08-12 22:00:49 +0000 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2019-08-12 22:00:49 +0000 |
commit | 4ce6d2b9db680b7c8563ee65fe25ee4d38a329e9 (patch) | |
tree | be082e3a62134d79215037d88d3c1e028558063b /spec | |
parent | 975763607443fad50e192411ad1da06ebb2ff532 (diff) | |
parent | 26107e93548c0b9dee7df0a7e4003f1d55be1975 (diff) | |
download | gitlab-ce-4ce6d2b9db680b7c8563ee65fe25ee4d38a329e9.tar.gz |
Merge branch 'sh-fix-import-export-suggestions' into 'master'
Properly save suggestions in project exports
Closes #65880
See merge request gitlab-org/gitlab-ce!31690
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/import_export/project.json | 16 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/project_tree_restorer_spec.rb | 7 |
2 files changed, 22 insertions, 1 deletions
diff --git a/spec/lib/gitlab/import_export/project.json b/spec/lib/gitlab/import_export/project.json index 6d70b147666..a211675bbf2 100644 --- a/spec/lib/gitlab/import_export/project.json +++ b/spec/lib/gitlab/import_export/project.json @@ -2450,7 +2450,21 @@ "author": { "name": "Ottis Schuster II" }, - "events": [] + "events": [], + "suggestions": [ + { + "id": 1, + "note_id": 674, + "relative_order": 0, + "applied": false, + "commit_id": null, + "from_content": "Original line\n", + "to_content": "New line\n", + "lines_above": 0, + "lines_below": 0, + "outdated": false + } + ] }, { "id": 675, 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 baec24590b4..d6e1fbaa979 100644 --- a/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb +++ b/spec/lib/gitlab/import_export/project_tree_restorer_spec.rb @@ -125,6 +125,13 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do expect(MergeRequest.find_by(title: 'MR1').resource_label_events).not_to be_empty end + it 'restores suggestion' do + note = Note.find_by("note LIKE 'Saepe asperiores exercitationem non dignissimos laborum reiciendis et ipsum%'") + + expect(note.suggestions.count).to eq(1) + expect(note.suggestions.first.from_content).to eq("Original line\n") + end + context 'event at forth level of the tree' do let(:event) { Event.where(action: 6).first } |