Commit 3d0fc7fe authored by Ash McKenzie's avatar Ash McKenzie

Ensure Issue & MR note_html cannot be imported

parent 1cbdc532
...@@ -158,8 +158,8 @@ ...@@ -158,8 +158,8 @@
{ {
"id": 351, "id": 351,
"note": "Quo reprehenderit aliquam qui dicta impedit cupiditate eligendi.", "note": "Quo reprehenderit aliquam qui dicta impedit cupiditate eligendi.",
"note_html": "<p>dodgy html</p>", "note_html": "<p>something else entirely</p>",
"cached_markdown_version": 434343, "cached_markdown_version": 917504,
"noteable_type": "Issue", "noteable_type": "Issue",
"author_id": 26, "author_id": 26,
"created_at": "2016-06-14T15:02:47.770Z", "created_at": "2016-06-14T15:02:47.770Z",
...@@ -2367,6 +2367,8 @@ ...@@ -2367,6 +2367,8 @@
{ {
"id": 671, "id": 671,
"note": "Sit voluptatibus eveniet architecto quidem.", "note": "Sit voluptatibus eveniet architecto quidem.",
"note_html": "<p>something else entirely</p>",
"cached_markdown_version": 917504,
"noteable_type": "MergeRequest", "noteable_type": "MergeRequest",
"author_id": 26, "author_id": 26,
"created_at": "2016-06-14T15:02:56.632Z", "created_at": "2016-06-14T15:02:56.632Z",
......
...@@ -10,7 +10,6 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do ...@@ -10,7 +10,6 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
create(:user, username: 'bernard_willms'), create(:user, username: 'bernard_willms'),
create(:user, username: 'saul_will') create(:user, username: 'saul_will')
] ]
@markdown_classes = [AbuseReport, Appearance, ApplicationSetting, BroadcastMessage, Issue, Label, MergeRequest, Milestone, Namespace, Project, Release, ResourceLabelEvent, Snippet, UserStatus]
RSpec::Mocks.with_temporary_scope do RSpec::Mocks.with_temporary_scope do
@project = create(:project, :builds_enabled, :issues_disabled, name: 'project', path: 'project') @project = create(:project, :builds_enabled, :issues_disabled, name: 'project', path: 'project')
...@@ -22,7 +21,6 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do ...@@ -22,7 +21,6 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
expect_any_instance_of(Gitlab::Git::Repository).to receive(:create_branch).with('feature', 'DCBA') 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) allow_any_instance_of(Gitlab::Git::Repository).to receive(:create_branch)
@markdown_classes.each {|klass| allow_any_instance_of(klass).to receive(:latest_cached_markdown_version).and_return(434343)}
@project_tree_restorer = described_class.new(user: @user, shared: @shared, project: @project) @project_tree_restorer = described_class.new(user: @user, shared: @shared, project: @project)
...@@ -61,20 +59,20 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do ...@@ -61,20 +59,20 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
end end
context 'when importing a project with cached_markdown_version and note_html' do context 'when importing a project with cached_markdown_version and note_html' do
let!(:issue) { Issue.find_by(description: 'Aliquam enim illo et possimus.') } context 'for an Issue' do
let(:note1) { issue.notes.select {|n| n.note.match(/Quo reprehenderit aliquam qui dicta impedit cupiditate eligendi/)}.first } it 'does not import note_html' do
let(:note2) { issue.notes.select {|n| n.note.match(/Est reprehenderit quas aut aspernatur autem recusandae voluptatem/)}.first } note_content = 'Quo reprehenderit aliquam qui dicta impedit cupiditate eligendi'
issue_note = Issue.find_by(description: 'Aliquam enim illo et possimus.').notes.select { |n| n.note.match(/#{note_content}/)}.first
it 'does not import the note_html' do expect(issue_note.note_html).to match(/#{note_content}/)
expect(note1.note_html).to match(/Quo reprehenderit aliquam qui dicta impedit cupiditate eligendi/)
end end
it 'does not set the old cached_markdown_version' do
expect(note2.cached_markdown_version).not_to eq(121212)
end end
it 'does not import the note_html' do context 'for a Merge Request' do
expect(note2.note_html).to match(/Est reprehenderit quas aut aspernatur autem recusandae voluptatem/) it 'does not import note_html' do
note_content = 'Sit voluptatibus eveniet architecto quidem'
merge_request_note = MergeRequest.find_by(title: 'MR1').notes.select { |n| n.note.match(/#{note_content}/)}.first
expect(merge_request_note.note_html).to match(/#{note_content}/)
end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment