2016-06-28 22:14:11 +00:00
|
|
|
require "spec_helper"
|
|
|
|
|
|
|
|
describe NotesHelper do
|
2017-04-30 20:32:09 +00:00
|
|
|
include RepoHelpers
|
|
|
|
|
2016-07-20 04:52:31 +00:00
|
|
|
let(:owner) { create(:owner) }
|
|
|
|
let(:group) { create(:group) }
|
2017-08-02 19:55:11 +00:00
|
|
|
let(:project) { create(:project, namespace: group) }
|
2018-07-11 14:36:08 +00:00
|
|
|
let(:maintainer) { create(:user) }
|
2016-07-20 04:52:31 +00:00
|
|
|
let(:reporter) { create(:user) }
|
|
|
|
let(:guest) { create(:user) }
|
2016-06-28 22:14:11 +00:00
|
|
|
|
2016-07-20 04:52:31 +00:00
|
|
|
let(:owner_note) { create(:note, author: owner, project: project) }
|
2018-07-11 14:36:08 +00:00
|
|
|
let(:maintainer_note) { create(:note, author: maintainer, project: project) }
|
2016-07-20 04:52:31 +00:00
|
|
|
let(:reporter_note) { create(:note, author: reporter, project: project) }
|
2018-07-11 14:36:08 +00:00
|
|
|
let!(:notes) { [owner_note, maintainer_note, reporter_note] }
|
2016-06-29 13:11:42 +00:00
|
|
|
|
2016-07-20 04:52:31 +00:00
|
|
|
before do
|
|
|
|
group.add_owner(owner)
|
2018-07-11 14:36:08 +00:00
|
|
|
project.add_maintainer(maintainer)
|
2017-12-22 08:18:28 +00:00
|
|
|
project.add_reporter(reporter)
|
|
|
|
project.add_guest(guest)
|
2016-07-20 04:52:31 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
describe "#notes_max_access_for_users" do
|
2017-07-29 15:04:42 +00:00
|
|
|
it 'returns access levels' do
|
|
|
|
expect(helper.note_max_access_for_user(owner_note)).to eq(Gitlab::Access::OWNER)
|
2018-07-11 14:36:08 +00:00
|
|
|
expect(helper.note_max_access_for_user(maintainer_note)).to eq(Gitlab::Access::MAINTAINER)
|
2017-07-29 15:04:42 +00:00
|
|
|
expect(helper.note_max_access_for_user(reporter_note)).to eq(Gitlab::Access::REPORTER)
|
2016-06-28 22:14:11 +00:00
|
|
|
end
|
2016-06-29 13:11:42 +00:00
|
|
|
|
|
|
|
it 'handles access in different projects' do
|
2017-08-02 19:55:11 +00:00
|
|
|
second_project = create(:project)
|
2018-07-11 14:36:08 +00:00
|
|
|
second_project.add_reporter(maintainer)
|
|
|
|
other_note = create(:note, author: maintainer, project: second_project)
|
2016-06-29 13:11:42 +00:00
|
|
|
|
2018-07-11 14:36:08 +00:00
|
|
|
expect(helper.note_max_access_for_user(maintainer_note)).to eq(Gitlab::Access::MAINTAINER)
|
2017-07-29 15:04:42 +00:00
|
|
|
expect(helper.note_max_access_for_user(other_note)).to eq(Gitlab::Access::REPORTER)
|
2017-07-27 20:38:52 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-04-30 20:32:09 +00:00
|
|
|
describe '#discussion_path' do
|
2017-08-01 18:51:52 +00:00
|
|
|
let(:project) { create(:project, :repository) }
|
2017-12-18 15:21:33 +00:00
|
|
|
let(:anchor) { discussion.line_code }
|
2017-04-30 20:32:09 +00:00
|
|
|
|
|
|
|
context 'for a merge request discusion' do
|
|
|
|
let(:merge_request) { create(:merge_request, source_project: project, target_project: project, importing: true) }
|
|
|
|
let!(:merge_request_diff1) { merge_request.merge_request_diffs.create(head_commit_sha: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9') }
|
|
|
|
let!(:merge_request_diff2) { merge_request.merge_request_diffs.create(head_commit_sha: nil) }
|
|
|
|
let!(:merge_request_diff3) { merge_request.merge_request_diffs.create(head_commit_sha: '5937ac0a7beb003549fc5fd26fc247adbce4a52e') }
|
|
|
|
|
|
|
|
context 'for a diff discussion' do
|
|
|
|
context 'when the discussion is active' do
|
|
|
|
let(:discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion }
|
|
|
|
|
|
|
|
it 'returns the diff path with the line code' do
|
2017-06-29 17:06:35 +00:00
|
|
|
expect(helper.discussion_path(discussion)).to eq(diffs_project_merge_request_path(project, merge_request, anchor: discussion.line_code))
|
2017-04-30 20:32:09 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the discussion is on an older merge request version' do
|
|
|
|
let(:position) do
|
|
|
|
Gitlab::Diff::Position.new(
|
|
|
|
old_path: ".gitmodules",
|
|
|
|
new_path: ".gitmodules",
|
|
|
|
old_line: nil,
|
|
|
|
new_line: 4,
|
|
|
|
diff_refs: merge_request_diff1.diff_refs
|
|
|
|
)
|
|
|
|
end
|
|
|
|
|
|
|
|
let(:diff_note) { create(:diff_note_on_merge_request, noteable: merge_request, project: project, position: position) }
|
|
|
|
let(:discussion) { diff_note.to_discussion }
|
|
|
|
|
|
|
|
before do
|
|
|
|
diff_note.position = diff_note.original_position
|
|
|
|
diff_note.save!
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns the diff version path with the line code' do
|
2017-06-29 17:06:35 +00:00
|
|
|
expect(helper.discussion_path(discussion)).to eq(diffs_project_merge_request_path(project, merge_request, diff_id: merge_request_diff1, anchor: discussion.line_code))
|
2017-04-30 20:32:09 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the discussion is on a comparison between merge request versions' do
|
|
|
|
let(:position) do
|
|
|
|
Gitlab::Diff::Position.new(
|
|
|
|
old_path: ".gitmodules",
|
|
|
|
new_path: ".gitmodules",
|
|
|
|
old_line: 4,
|
|
|
|
new_line: 4,
|
|
|
|
diff_refs: merge_request_diff3.compare_with(merge_request_diff1.head_commit_sha).diff_refs
|
|
|
|
)
|
|
|
|
end
|
|
|
|
|
2017-05-22 20:56:20 +00:00
|
|
|
let(:diff_note) { create(:diff_note_on_merge_request, noteable: merge_request, project: project, position: position) }
|
|
|
|
let(:discussion) { diff_note.to_discussion }
|
|
|
|
|
|
|
|
before do
|
|
|
|
diff_note.position = diff_note.original_position
|
|
|
|
diff_note.save!
|
|
|
|
end
|
2017-04-30 20:32:09 +00:00
|
|
|
|
|
|
|
it 'returns the diff version comparison path with the line code' do
|
2017-06-29 17:06:35 +00:00
|
|
|
expect(helper.discussion_path(discussion)).to eq(diffs_project_merge_request_path(project, merge_request, diff_id: merge_request_diff3, start_sha: merge_request_diff1.head_commit_sha, anchor: discussion.line_code))
|
2017-04-30 20:32:09 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the discussion does not have a merge request version' do
|
|
|
|
let(:outdated_diff_note) { create(:diff_note_on_merge_request, noteable: merge_request, project: project, diff_refs: project.commit(sample_commit.id).diff_refs) }
|
|
|
|
let(:discussion) { outdated_diff_note.to_discussion }
|
|
|
|
|
|
|
|
before do
|
|
|
|
outdated_diff_note.position = outdated_diff_note.original_position
|
|
|
|
outdated_diff_note.save!
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns nil' do
|
|
|
|
expect(helper.discussion_path(discussion)).to be_nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'for a legacy diff discussion' do
|
|
|
|
let(:discussion) { create(:legacy_diff_note_on_merge_request, noteable: merge_request, project: project).to_discussion }
|
|
|
|
|
|
|
|
context 'when the discussion is active' do
|
|
|
|
before do
|
|
|
|
allow(discussion).to receive(:active?).and_return(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns the diff path with the line code' do
|
2017-06-29 17:06:35 +00:00
|
|
|
expect(helper.discussion_path(discussion)).to eq(diffs_project_merge_request_path(project, merge_request, anchor: discussion.line_code))
|
2017-04-30 20:32:09 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the discussion is outdated' do
|
|
|
|
before do
|
|
|
|
allow(discussion).to receive(:active?).and_return(false)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns nil' do
|
|
|
|
expect(helper.discussion_path(discussion)).to be_nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'for a non-diff discussion' do
|
|
|
|
let(:discussion) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project).to_discussion }
|
|
|
|
|
|
|
|
it 'returns nil' do
|
|
|
|
expect(helper.discussion_path(discussion)).to be_nil
|
|
|
|
end
|
|
|
|
end
|
2017-12-18 15:21:33 +00:00
|
|
|
|
|
|
|
context 'for a contextual commit discussion' do
|
|
|
|
let(:commit) { merge_request.commits.last }
|
|
|
|
let(:discussion) { create(:diff_note_on_merge_request, noteable: merge_request, project: project, commit_id: commit.id).to_discussion }
|
|
|
|
|
|
|
|
it 'returns the merge request diff discussion scoped in the commit' do
|
|
|
|
expect(helper.discussion_path(discussion)).to eq(diffs_project_merge_request_path(project, merge_request, commit_id: commit.id, anchor: anchor))
|
|
|
|
end
|
|
|
|
end
|
2017-04-30 20:32:09 +00:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'for a commit discussion' do
|
|
|
|
let(:commit) { discussion.noteable }
|
|
|
|
|
|
|
|
context 'for a diff discussion' do
|
|
|
|
let(:discussion) { create(:diff_note_on_commit, project: project).to_discussion }
|
|
|
|
|
|
|
|
it 'returns the commit path with the line code' do
|
2017-12-18 15:21:33 +00:00
|
|
|
expect(helper.discussion_path(discussion)).to eq(project_commit_path(project, commit, anchor: anchor))
|
2017-04-30 20:32:09 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'for a legacy diff discussion' do
|
|
|
|
let(:discussion) { create(:legacy_diff_note_on_commit, project: project).to_discussion }
|
|
|
|
|
|
|
|
it 'returns the commit path with the line code' do
|
2017-12-18 15:21:33 +00:00
|
|
|
expect(helper.discussion_path(discussion)).to eq(project_commit_path(project, commit, anchor: anchor))
|
2017-04-30 20:32:09 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'for a non-diff discussion' do
|
|
|
|
let(:discussion) { create(:discussion_note_on_commit, project: project).to_discussion }
|
|
|
|
|
|
|
|
it 'returns the commit path' do
|
2017-06-29 17:06:35 +00:00
|
|
|
expect(helper.discussion_path(discussion)).to eq(project_commit_path(project, commit))
|
2017-04-30 20:32:09 +00:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2017-05-03 08:48:01 +00:00
|
|
|
|
|
|
|
describe '#notes_url' do
|
|
|
|
it 'return snippet notes path for personal snippet' do
|
|
|
|
@snippet = create(:personal_snippet)
|
|
|
|
|
|
|
|
expect(helper.notes_url).to eq("/snippets/#{@snippet.id}/notes")
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'return project notes path for project snippet' do
|
|
|
|
namespace = create(:namespace, path: 'nm')
|
2017-08-02 19:55:11 +00:00
|
|
|
@project = create(:project, path: 'test', namespace: namespace)
|
2017-05-03 08:48:01 +00:00
|
|
|
@snippet = create(:project_snippet, project: @project)
|
|
|
|
@noteable = @snippet
|
|
|
|
|
|
|
|
expect(helper.notes_url).to eq("/nm/test/noteable/project_snippet/#{@noteable.id}/notes")
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'return project notes path for other noteables' do
|
|
|
|
namespace = create(:namespace, path: 'nm')
|
2017-08-02 19:55:11 +00:00
|
|
|
@project = create(:project, path: 'test', namespace: namespace)
|
2017-05-03 08:48:01 +00:00
|
|
|
@noteable = create(:issue, project: @project)
|
|
|
|
|
|
|
|
expect(helper.notes_url).to eq("/nm/test/noteable/issue/#{@noteable.id}/notes")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#note_url' do
|
|
|
|
it 'return snippet notes path for personal snippet' do
|
|
|
|
note = create(:note_on_personal_snippet)
|
|
|
|
|
|
|
|
expect(helper.note_url(note)).to eq("/snippets/#{note.noteable.id}/notes/#{note.id}")
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'return project notes path for project snippet' do
|
|
|
|
namespace = create(:namespace, path: 'nm')
|
2017-08-02 19:55:11 +00:00
|
|
|
@project = create(:project, path: 'test', namespace: namespace)
|
2017-05-03 08:48:01 +00:00
|
|
|
note = create(:note_on_project_snippet, project: @project)
|
|
|
|
|
|
|
|
expect(helper.note_url(note)).to eq("/nm/test/notes/#{note.id}")
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'return project notes path for other noteables' do
|
|
|
|
namespace = create(:namespace, path: 'nm')
|
2017-08-02 19:55:11 +00:00
|
|
|
@project = create(:project, path: 'test', namespace: namespace)
|
2017-05-03 08:48:01 +00:00
|
|
|
note = create(:note_on_issue, project: @project)
|
|
|
|
|
|
|
|
expect(helper.note_url(note)).to eq("/nm/test/notes/#{note.id}")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-09-05 15:49:05 +00:00
|
|
|
describe '#form_resources' do
|
2017-05-03 08:48:01 +00:00
|
|
|
it 'returns note for personal snippet' do
|
|
|
|
@snippet = create(:personal_snippet)
|
|
|
|
@note = create(:note_on_personal_snippet)
|
|
|
|
|
|
|
|
expect(helper.form_resources).to eq([@note])
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns namespace, project and note for project snippet' do
|
|
|
|
namespace = create(:namespace, path: 'nm')
|
2017-08-02 19:55:11 +00:00
|
|
|
@project = create(:project, path: 'test', namespace: namespace)
|
2017-05-03 08:48:01 +00:00
|
|
|
@snippet = create(:project_snippet, project: @project)
|
|
|
|
@note = create(:note_on_personal_snippet)
|
|
|
|
|
|
|
|
expect(helper.form_resources).to eq([@project.namespace, @project, @note])
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns namespace, project and note path for other noteables' do
|
|
|
|
namespace = create(:namespace, path: 'nm')
|
2017-08-02 19:55:11 +00:00
|
|
|
@project = create(:project, path: 'test', namespace: namespace)
|
2017-05-03 08:48:01 +00:00
|
|
|
@note = create(:note_on_issue, project: @project)
|
|
|
|
|
|
|
|
expect(helper.form_resources).to eq([@project.namespace, @project, @note])
|
|
|
|
end
|
|
|
|
end
|
2017-06-07 18:33:50 +00:00
|
|
|
|
|
|
|
describe '#noteable_note_url' do
|
2017-08-02 19:55:11 +00:00
|
|
|
let(:project) { create(:project) }
|
2017-06-07 18:33:50 +00:00
|
|
|
let(:issue) { create(:issue, project: project) }
|
|
|
|
let(:note) { create(:note_on_issue, noteable: issue, project: project) }
|
|
|
|
|
|
|
|
it 'returns the noteable url with an anchor to the note' do
|
|
|
|
expect(noteable_note_url(note)).to match("/#{project.namespace.path}/#{project.path}/issues/#{issue.iid}##{dom_id(note)}")
|
|
|
|
end
|
|
|
|
end
|
2017-09-05 15:49:05 +00:00
|
|
|
|
|
|
|
describe '#discussion_resolved_intro' do
|
|
|
|
context 'when the discussion was resolved by a push' do
|
|
|
|
let(:discussion) { double(:discussion, resolved_by_push?: true) }
|
|
|
|
|
|
|
|
it 'returns "Automatically resolved"' do
|
|
|
|
expect(discussion_resolved_intro(discussion)).to eq('Automatically resolved')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the discussion was not resolved by a push' do
|
|
|
|
let(:discussion) { double(:discussion, resolved_by_push?: false) }
|
|
|
|
|
|
|
|
it 'returns "Resolved"' do
|
|
|
|
expect(discussion_resolved_intro(discussion)).to eq('Resolved')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-06-28 22:14:11 +00:00
|
|
|
end
|