2019-07-31 22:56:46 +05:30
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2016-04-02 18:10:28 +05:30
|
|
|
require 'spec_helper'
|
|
|
|
|
2020-07-28 23:09:34 +05:30
|
|
|
RSpec.describe TodoService do
|
2021-04-29 21:17:54 +05:30
|
|
|
include AfterNextHelpers
|
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
let_it_be(:project) { create(:project, :repository) }
|
|
|
|
let_it_be(:author) { create(:user) }
|
|
|
|
let_it_be(:assignee) { create(:user) }
|
|
|
|
let_it_be(:non_member) { create(:user) }
|
|
|
|
let_it_be(:member) { create(:user) }
|
|
|
|
let_it_be(:guest) { create(:user) }
|
|
|
|
let_it_be(:admin) { create(:admin) }
|
|
|
|
let_it_be(:john_doe) { create(:user) }
|
|
|
|
let_it_be(:skipped) { create(:user) }
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:skip_users) { [skipped] }
|
|
|
|
let(:mentions) { 'FYI: ' + [author, assignee, john_doe, member, guest, non_member, admin, skipped].map(&:to_reference).join(' ') }
|
|
|
|
let(:directly_addressed) { [author, assignee, john_doe, member, guest, non_member, admin, skipped].map(&:to_reference).join(' ') }
|
|
|
|
let(:directly_addressed_and_mentioned) { member.to_reference + ", what do you think? cc: " + [guest, admin, skipped].map(&:to_reference).join(' ') }
|
2016-04-02 18:10:28 +05:30
|
|
|
let(:service) { described_class.new }
|
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
before_all do
|
2018-03-17 18:26:18 +05:30
|
|
|
project.add_guest(guest)
|
|
|
|
project.add_developer(author)
|
2019-01-03 12:48:30 +05:30
|
|
|
project.add_developer(assignee)
|
2018-03-17 18:26:18 +05:30
|
|
|
project.add_developer(member)
|
|
|
|
project.add_developer(john_doe)
|
|
|
|
project.add_developer(skipped)
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
shared_examples 'reassigned target' do
|
|
|
|
it 'creates a pending todo for new assignee' do
|
|
|
|
target_unassigned.assignees = [john_doe]
|
|
|
|
service.send(described_method, target_unassigned, author)
|
|
|
|
|
|
|
|
should_create_todo(user: john_doe, target: target_unassigned, action: Todo::ASSIGNED)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a todo if unassigned' do
|
|
|
|
target_assigned.assignees = []
|
|
|
|
|
|
|
|
should_not_create_any_todo { service.send(described_method, target_assigned, author) }
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a todo if new assignee is the current user' do
|
|
|
|
target_assigned.assignees = [john_doe]
|
|
|
|
service.send(described_method, target_assigned, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(user: john_doe, target: target_assigned, author: john_doe, action: Todo::ASSIGNED)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a todo for guests' do
|
|
|
|
service.send(described_method, target_assigned, author)
|
|
|
|
should_not_create_todo(user: guest, target: target_assigned, action: Todo::MENTIONED)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a directly addressed todo for guests' do
|
|
|
|
service.send(described_method, addressed_target_assigned, author)
|
|
|
|
|
|
|
|
should_not_create_todo(user: guest, target: addressed_target_assigned, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
end
|
2020-10-24 23:57:45 +05:30
|
|
|
|
|
|
|
it 'does not create a todo if already assigned' do
|
|
|
|
should_not_create_any_todo { service.send(described_method, target_assigned, author, [john_doe]) }
|
|
|
|
end
|
2020-06-23 00:09:42 +05:30
|
|
|
end
|
|
|
|
|
2020-11-24 15:15:51 +05:30
|
|
|
shared_examples 'reassigned reviewable target' do
|
|
|
|
context 'with no existing reviewers' do
|
|
|
|
let(:assigned_reviewers) { [] }
|
|
|
|
|
|
|
|
it 'creates a pending todo for new reviewer' do
|
|
|
|
target.reviewers = [john_doe]
|
|
|
|
service.send(described_method, target, author)
|
|
|
|
|
|
|
|
should_create_todo(user: john_doe, target: target, action: Todo::REVIEW_REQUESTED)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with an existing reviewer' do
|
|
|
|
let(:assigned_reviewers) { [john_doe] }
|
|
|
|
|
|
|
|
it 'does not create a todo if unassigned' do
|
|
|
|
target.reviewers = []
|
|
|
|
|
|
|
|
should_not_create_any_todo { service.send(described_method, target, author) }
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a todo if new reviewer is the current user' do
|
|
|
|
target.reviewers = [john_doe]
|
|
|
|
service.send(described_method, target, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(user: john_doe, target: target, author: john_doe, action: Todo::REVIEW_REQUESTED)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a todo if already assigned' do
|
|
|
|
should_not_create_any_todo { service.send(described_method, target, author, [john_doe]) }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-04-02 18:10:28 +05:30
|
|
|
describe 'Issues' do
|
2021-03-08 18:12:59 +05:30
|
|
|
let(:issue) { create(:issue, project: project, author: author, description: "- [ ] Task 1\n- [ ] Task 2 #{mentions}") }
|
|
|
|
let(:addressed_issue) { create(:issue, project: project, author: author, description: "#{directly_addressed}\n- [ ] Task 1\n- [ ] Task 2") }
|
|
|
|
let(:assigned_issue) { create(:issue, project: project, assignees: [john_doe]) }
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:unassigned_issue) { create(:issue, project: project, assignees: []) }
|
|
|
|
let(:confidential_issue) { create(:issue, :confidential, project: project, author: author, assignees: [assignee], description: mentions) }
|
|
|
|
let(:addressed_confident_issue) { create(:issue, :confidential, project: project, author: author, assignees: [assignee], description: directly_addressed) }
|
2016-04-02 18:10:28 +05:30
|
|
|
|
|
|
|
describe '#new_issue' do
|
|
|
|
it 'creates a todo if assigned' do
|
2021-03-08 18:12:59 +05:30
|
|
|
service.new_issue(assigned_issue, author)
|
2016-04-02 18:10:28 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_create_todo(user: john_doe, target: assigned_issue, action: Todo::ASSIGNED)
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a todo if unassigned' do
|
|
|
|
should_not_create_any_todo { service.new_issue(unassigned_issue, author) }
|
|
|
|
end
|
|
|
|
|
2016-08-24 12:49:21 +05:30
|
|
|
it 'creates a todo if assignee is the current user' do
|
2017-08-17 22:00:37 +05:30
|
|
|
unassigned_issue.assignees = [john_doe]
|
2016-08-24 12:49:21 +05:30
|
|
|
service.new_issue(unassigned_issue, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(user: john_doe, target: unassigned_issue, author: john_doe, action: Todo::ASSIGNED)
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a todo for each valid mentioned user' do
|
|
|
|
service.new_issue(issue, author)
|
|
|
|
|
2016-06-02 11:05:42 +05:30
|
|
|
should_create_todo(user: member, target: issue, action: Todo::MENTIONED)
|
2016-06-16 23:09:34 +05:30
|
|
|
should_create_todo(user: guest, target: issue, action: Todo::MENTIONED)
|
2016-08-24 12:49:21 +05:30
|
|
|
should_create_todo(user: author, target: issue, action: Todo::MENTIONED)
|
2021-03-08 18:12:59 +05:30
|
|
|
should_create_todo(user: john_doe, target: issue, action: Todo::MENTIONED)
|
2016-06-02 11:05:42 +05:30
|
|
|
should_not_create_todo(user: non_member, target: issue, action: Todo::MENTIONED)
|
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'creates a directly addressed todo for each valid addressed user' do
|
|
|
|
service.new_issue(addressed_issue, author)
|
|
|
|
|
|
|
|
should_create_todo(user: member, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: guest, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: author, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
2021-03-08 18:12:59 +05:30
|
|
|
should_create_todo(user: john_doe, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
2017-08-17 22:00:37 +05:30
|
|
|
should_not_create_todo(user: non_member, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates correct todos for each valid user based on the type of mention' do
|
2021-01-29 00:20:46 +05:30
|
|
|
issue.update!(description: directly_addressed_and_mentioned)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
service.new_issue(issue, author)
|
|
|
|
|
|
|
|
should_create_todo(user: member, target: issue, action: Todo::DIRECTLY_ADDRESSED)
|
2021-01-29 00:20:46 +05:30
|
|
|
should_not_create_todo(user: admin, target: issue, action: Todo::MENTIONED)
|
2017-08-17 22:00:37 +05:30
|
|
|
should_create_todo(user: guest, target: issue, action: Todo::MENTIONED)
|
|
|
|
end
|
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
it 'does not create todo if user can not see the issue when issue is confidential' do
|
2016-06-02 11:05:42 +05:30
|
|
|
service.new_issue(confidential_issue, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(user: assignee, target: confidential_issue, author: john_doe, action: Todo::ASSIGNED)
|
|
|
|
should_create_todo(user: author, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
|
|
|
|
should_create_todo(user: member, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
|
2021-01-29 00:20:46 +05:30
|
|
|
should_not_create_todo(user: admin, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
|
2016-06-16 23:09:34 +05:30
|
|
|
should_not_create_todo(user: guest, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
|
2016-08-24 12:49:21 +05:30
|
|
|
should_create_todo(user: john_doe, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'does not create directly addressed todo if user cannot see the issue when issue is confidential' do
|
|
|
|
service.new_issue(addressed_confident_issue, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(user: assignee, target: addressed_confident_issue, author: john_doe, action: Todo::ASSIGNED)
|
|
|
|
should_create_todo(user: author, target: addressed_confident_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: member, target: addressed_confident_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED)
|
2021-01-29 00:20:46 +05:30
|
|
|
should_not_create_todo(user: admin, target: addressed_confident_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED)
|
2017-08-17 22:00:37 +05:30
|
|
|
should_not_create_todo(user: guest, target: addressed_confident_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: john_doe, target: addressed_confident_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
end
|
|
|
|
|
2016-06-02 11:05:42 +05:30
|
|
|
context 'when a private group is mentioned' do
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:group) { create(:group, :private) }
|
2017-09-10 17:25:29 +05:30
|
|
|
let(:project) { create(:project, :private, group: group) }
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:issue) { create(:issue, author: author, project: project, description: group.to_reference) }
|
2016-06-02 11:05:42 +05:30
|
|
|
|
|
|
|
before do
|
|
|
|
group.add_owner(author)
|
|
|
|
group.add_user(member, Gitlab::Access::DEVELOPER)
|
|
|
|
group.add_user(john_doe, Gitlab::Access::DEVELOPER)
|
|
|
|
|
|
|
|
service.new_issue(issue, author)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a todo for group members' do
|
|
|
|
should_create_todo(user: member, target: issue)
|
|
|
|
should_create_todo(user: john_doe, target: issue)
|
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
2020-11-24 15:15:51 +05:30
|
|
|
|
|
|
|
context 'issue is an incident' do
|
|
|
|
let(:issue) { create(:incident, project: project, assignees: [john_doe], author: author) }
|
|
|
|
|
|
|
|
subject do
|
|
|
|
service.new_issue(issue, author)
|
|
|
|
should_create_todo(user: john_doe, target: issue, action: Todo::ASSIGNED)
|
|
|
|
end
|
|
|
|
|
|
|
|
it_behaves_like 'an incident management tracked event', :incident_management_incident_todo do
|
|
|
|
let(:current_user) { john_doe}
|
|
|
|
end
|
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
describe '#update_issue' do
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'creates a todo for each valid mentioned user not included in skip_users' do
|
|
|
|
service.update_issue(issue, author, skip_users)
|
2016-04-02 18:10:28 +05:30
|
|
|
|
2016-06-02 11:05:42 +05:30
|
|
|
should_create_todo(user: member, target: issue, action: Todo::MENTIONED)
|
2016-06-16 23:09:34 +05:30
|
|
|
should_create_todo(user: guest, target: issue, action: Todo::MENTIONED)
|
2016-04-02 18:10:28 +05:30
|
|
|
should_create_todo(user: john_doe, target: issue, action: Todo::MENTIONED)
|
2016-08-24 12:49:21 +05:30
|
|
|
should_create_todo(user: author, target: issue, action: Todo::MENTIONED)
|
2016-06-02 11:05:42 +05:30
|
|
|
should_not_create_todo(user: non_member, target: issue, action: Todo::MENTIONED)
|
2017-08-17 22:00:37 +05:30
|
|
|
should_not_create_todo(user: skipped, target: issue, action: Todo::MENTIONED)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a todo for each valid user not included in skip_users based on the type of mention' do
|
2021-01-29 00:20:46 +05:30
|
|
|
issue.update!(description: directly_addressed_and_mentioned)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
service.update_issue(issue, author, skip_users)
|
|
|
|
|
|
|
|
should_create_todo(user: member, target: issue, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: guest, target: issue, action: Todo::MENTIONED)
|
2021-01-29 00:20:46 +05:30
|
|
|
should_not_create_todo(user: admin, target: issue, action: Todo::MENTIONED)
|
2017-08-17 22:00:37 +05:30
|
|
|
should_not_create_todo(user: skipped, target: issue)
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'creates a directly addressed todo for each valid addressed user not included in skip_users' do
|
|
|
|
service.update_issue(addressed_issue, author, skip_users)
|
|
|
|
|
|
|
|
should_create_todo(user: member, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: guest, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: john_doe, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: author, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: non_member, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: skipped, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a todo if user was already mentioned and todo is pending' do
|
2021-03-08 18:12:59 +05:30
|
|
|
stub_feature_flags(multiple_todos: false)
|
|
|
|
|
2016-06-02 11:05:42 +05:30
|
|
|
create(:todo, :mentioned, user: member, project: project, target: issue, author: author)
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
expect { service.update_issue(issue, author, skip_users) }.not_to change(member.todos, :count)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a todo if user was already mentioned and todo is done' do
|
|
|
|
create(:todo, :mentioned, :done, user: skipped, project: project, target: issue, author: author)
|
|
|
|
|
|
|
|
expect { service.update_issue(issue, author, skip_users) }.not_to change(skipped.todos, :count)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a directly addressed todo if user was already mentioned or addressed and todo is pending' do
|
2021-03-08 18:12:59 +05:30
|
|
|
stub_feature_flags(multiple_todos: false)
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
create(:todo, :directly_addressed, user: member, project: project, target: addressed_issue, author: author)
|
|
|
|
|
|
|
|
expect { service.update_issue(addressed_issue, author, skip_users) }.not_to change(member.todos, :count)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a directly addressed todo if user was already mentioned or addressed and todo is done' do
|
|
|
|
create(:todo, :directly_addressed, :done, user: skipped, project: project, target: addressed_issue, author: author)
|
|
|
|
|
|
|
|
expect { service.update_issue(addressed_issue, author, skip_users) }.not_to change(skipped.todos, :count)
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
it 'does not create todo if user can not see the issue when issue is confidential' do
|
2016-06-02 11:05:42 +05:30
|
|
|
service.update_issue(confidential_issue, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(user: author, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
|
|
|
|
should_create_todo(user: assignee, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
|
|
|
|
should_create_todo(user: member, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
|
2021-01-29 00:20:46 +05:30
|
|
|
should_not_create_todo(user: admin, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
|
2016-06-16 23:09:34 +05:30
|
|
|
should_not_create_todo(user: guest, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
|
2016-08-24 12:49:21 +05:30
|
|
|
should_create_todo(user: john_doe, target: confidential_issue, author: john_doe, action: Todo::MENTIONED)
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
2016-06-16 23:09:34 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'does not create a directly addressed todo if user can not see the issue when issue is confidential' do
|
|
|
|
service.update_issue(addressed_confident_issue, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(user: author, target: addressed_confident_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: assignee, target: addressed_confident_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: member, target: addressed_confident_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED)
|
2021-01-29 00:20:46 +05:30
|
|
|
should_not_create_todo(user: admin, target: addressed_confident_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED)
|
2017-08-17 22:00:37 +05:30
|
|
|
should_not_create_todo(user: guest, target: addressed_confident_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: john_doe, target: addressed_confident_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
end
|
|
|
|
|
2016-06-22 15:30:34 +05:30
|
|
|
context 'issues with a task list' do
|
|
|
|
it 'does not create todo when tasks are marked as completed' do
|
2021-01-29 00:20:46 +05:30
|
|
|
issue.update!(description: "- [x] Task 1\n- [X] Task 2 #{mentions}")
|
2016-06-22 15:30:34 +05:30
|
|
|
|
|
|
|
service.update_issue(issue, author)
|
|
|
|
|
|
|
|
should_not_create_todo(user: admin, target: issue, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: assignee, target: issue, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: author, target: issue, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: john_doe, target: issue, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: member, target: issue, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: non_member, target: issue, action: Todo::MENTIONED)
|
|
|
|
end
|
2016-06-16 23:09:34 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'does not create directly addressed todo when tasks are marked as completed' do
|
2021-01-29 00:20:46 +05:30
|
|
|
addressed_issue.update!(description: "#{directly_addressed}\n- [x] Task 1\n- [x] Task 2\n")
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
service.update_issue(addressed_issue, author)
|
|
|
|
|
|
|
|
should_not_create_todo(user: admin, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: assignee, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: author, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: john_doe, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: member, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: non_member, target: addressed_issue, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
end
|
|
|
|
|
2016-06-22 15:30:34 +05:30
|
|
|
it 'does not raise an error when description not change' do
|
2021-01-29 00:20:46 +05:30
|
|
|
issue.update!(title: 'Sample')
|
2016-06-16 23:09:34 +05:30
|
|
|
|
2016-06-22 15:30:34 +05:30
|
|
|
expect { service.update_issue(issue, author) }.not_to raise_error
|
|
|
|
end
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
describe '#close_issue' do
|
|
|
|
it 'marks related pending todos to the target for the user as done' do
|
|
|
|
first_todo = create(:todo, :assigned, user: john_doe, project: project, target: issue, author: author)
|
|
|
|
second_todo = create(:todo, :assigned, user: john_doe, project: project, target: issue, author: author)
|
|
|
|
|
|
|
|
service.close_issue(issue, john_doe)
|
|
|
|
|
|
|
|
expect(first_todo.reload).to be_done
|
|
|
|
expect(second_todo.reload).to be_done
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
describe '#destroy_target' do
|
|
|
|
it 'refreshes the todos count cache for users with todos on the target' do
|
2021-04-29 21:17:54 +05:30
|
|
|
create(:todo, state: :pending, target: issue, user: john_doe, author: john_doe, project: issue.project)
|
2016-09-29 09:46:39 +05:30
|
|
|
|
2021-04-29 21:17:54 +05:30
|
|
|
expect_next(Users::UpdateTodoCountCacheService, [john_doe]).to receive(:execute)
|
2018-03-17 18:26:18 +05:30
|
|
|
|
2021-04-29 21:17:54 +05:30
|
|
|
service.destroy_target(issue) { issue.destroy! }
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not refresh the todos count cache for users with only done todos on the target' do
|
|
|
|
create(:todo, :done, target: issue, user: john_doe, author: john_doe, project: issue.project)
|
|
|
|
|
2021-04-29 21:17:54 +05:30
|
|
|
expect(Users::UpdateTodoCountCacheService).not_to receive(:new)
|
2018-03-17 18:26:18 +05:30
|
|
|
|
2021-04-29 21:17:54 +05:30
|
|
|
service.destroy_target(issue) { issue.destroy! }
|
2018-03-17 18:26:18 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'yields the target to the caller' do
|
|
|
|
expect { |b| service.destroy_target(issue, &b) }
|
|
|
|
.to yield_with_args(issue)
|
2016-09-29 09:46:39 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
describe '#resolve_todos_for_target' do
|
2016-04-02 18:10:28 +05:30
|
|
|
it 'marks related pending todos to the target for the user as done' do
|
|
|
|
first_todo = create(:todo, :assigned, user: john_doe, project: project, target: issue, author: author)
|
|
|
|
second_todo = create(:todo, :assigned, user: john_doe, project: project, target: issue, author: author)
|
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
service.resolve_todos_for_target(issue, john_doe)
|
2016-04-02 18:10:28 +05:30
|
|
|
|
|
|
|
expect(first_todo.reload).to be_done
|
|
|
|
expect(second_todo.reload).to be_done
|
|
|
|
end
|
2016-06-22 15:30:34 +05:30
|
|
|
|
|
|
|
describe 'cached counts' do
|
|
|
|
it 'updates when todos change' do
|
|
|
|
create(:todo, :assigned, user: john_doe, project: project, target: issue, author: author)
|
|
|
|
|
|
|
|
expect(john_doe.todos_done_count).to eq(0)
|
|
|
|
expect(john_doe.todos_pending_count).to eq(1)
|
|
|
|
expect(john_doe).to receive(:update_todos_count_cache).and_call_original
|
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
service.resolve_todos_for_target(issue, john_doe)
|
2016-06-22 15:30:34 +05:30
|
|
|
|
|
|
|
expect(john_doe.todos_done_count).to eq(1)
|
|
|
|
expect(john_doe.todos_pending_count).to eq(0)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-04-02 18:10:28 +05:30
|
|
|
describe '#new_note' do
|
|
|
|
let!(:first_todo) { create(:todo, :assigned, user: john_doe, project: project, target: issue, author: author) }
|
|
|
|
let!(:second_todo) { create(:todo, :assigned, user: john_doe, project: project, target: issue, author: author) }
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:confidential_issue) { create(:issue, :confidential, project: project, author: author, assignees: [assignee]) }
|
2016-04-02 18:10:28 +05:30
|
|
|
let(:note) { create(:note, project: project, noteable: issue, author: john_doe, note: mentions) }
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:addressed_note) { create(:note, project: project, noteable: issue, author: john_doe, note: directly_addressed) }
|
2016-04-02 18:10:28 +05:30
|
|
|
let(:note_on_commit) { create(:note_on_commit, project: project, author: john_doe, note: mentions) }
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:addressed_note_on_commit) { create(:note_on_commit, project: project, author: john_doe, note: directly_addressed) }
|
2016-06-02 11:05:42 +05:30
|
|
|
let(:note_on_confidential_issue) { create(:note_on_issue, noteable: confidential_issue, project: project, note: mentions) }
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:addressed_note_on_confidential_issue) { create(:note_on_issue, noteable: confidential_issue, project: project, note: directly_addressed) }
|
2016-04-02 18:10:28 +05:30
|
|
|
let(:note_on_project_snippet) { create(:note_on_project_snippet, project: project, author: john_doe, note: mentions) }
|
|
|
|
let(:system_note) { create(:system_note, project: project, noteable: issue) }
|
|
|
|
|
|
|
|
it 'mark related pending todos to the noteable for the note author as done' do
|
|
|
|
first_todo = create(:todo, :assigned, user: john_doe, project: project, target: issue, author: author)
|
|
|
|
second_todo = create(:todo, :assigned, user: john_doe, project: project, target: issue, author: author)
|
|
|
|
|
|
|
|
service.new_note(note, john_doe)
|
|
|
|
|
|
|
|
expect(first_todo.reload).to be_done
|
|
|
|
expect(second_todo.reload).to be_done
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not mark related pending todos it is a system note' do
|
|
|
|
service.new_note(system_note, john_doe)
|
|
|
|
|
|
|
|
expect(first_todo.reload).to be_pending
|
|
|
|
expect(second_todo.reload).to be_pending
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a todo for each valid mentioned user' do
|
|
|
|
service.new_note(note, john_doe)
|
|
|
|
|
2016-06-02 11:05:42 +05:30
|
|
|
should_create_todo(user: member, target: issue, author: john_doe, action: Todo::MENTIONED, note: note)
|
2016-06-16 23:09:34 +05:30
|
|
|
should_create_todo(user: guest, target: issue, author: john_doe, action: Todo::MENTIONED, note: note)
|
2016-04-02 18:10:28 +05:30
|
|
|
should_create_todo(user: author, target: issue, author: john_doe, action: Todo::MENTIONED, note: note)
|
2016-08-24 12:49:21 +05:30
|
|
|
should_create_todo(user: john_doe, target: issue, author: john_doe, action: Todo::MENTIONED, note: note)
|
2016-06-02 11:05:42 +05:30
|
|
|
should_not_create_todo(user: non_member, target: issue, author: john_doe, action: Todo::MENTIONED, note: note)
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'creates a todo for each valid user based on the type of mention' do
|
2021-01-29 00:20:46 +05:30
|
|
|
note.update!(note: directly_addressed_and_mentioned)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
service.new_note(note, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(user: member, target: issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED, note: note)
|
2021-01-29 00:20:46 +05:30
|
|
|
should_not_create_todo(user: admin, target: issue, author: john_doe, action: Todo::MENTIONED, note: note)
|
2017-08-17 22:00:37 +05:30
|
|
|
should_create_todo(user: guest, target: issue, author: john_doe, action: Todo::MENTIONED, note: note)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a directly addressed todo for each valid addressed user' do
|
|
|
|
service.new_note(addressed_note, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(user: member, target: issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED, note: addressed_note)
|
|
|
|
should_create_todo(user: guest, target: issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED, note: addressed_note)
|
|
|
|
should_create_todo(user: author, target: issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED, note: addressed_note)
|
|
|
|
should_create_todo(user: john_doe, target: issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED, note: addressed_note)
|
|
|
|
should_not_create_todo(user: non_member, target: issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED, note: addressed_note)
|
|
|
|
end
|
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
it 'does not create todo if user can not see the issue when leaving a note on a confidential issue' do
|
2016-06-02 11:05:42 +05:30
|
|
|
service.new_note(note_on_confidential_issue, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(user: author, target: confidential_issue, author: john_doe, action: Todo::MENTIONED, note: note_on_confidential_issue)
|
|
|
|
should_create_todo(user: assignee, target: confidential_issue, author: john_doe, action: Todo::MENTIONED, note: note_on_confidential_issue)
|
|
|
|
should_create_todo(user: member, target: confidential_issue, author: john_doe, action: Todo::MENTIONED, note: note_on_confidential_issue)
|
2021-01-29 00:20:46 +05:30
|
|
|
should_not_create_todo(user: admin, target: confidential_issue, author: john_doe, action: Todo::MENTIONED, note: note_on_confidential_issue)
|
2016-06-16 23:09:34 +05:30
|
|
|
should_not_create_todo(user: guest, target: confidential_issue, author: john_doe, action: Todo::MENTIONED, note: note_on_confidential_issue)
|
2016-08-24 12:49:21 +05:30
|
|
|
should_create_todo(user: john_doe, target: confidential_issue, author: john_doe, action: Todo::MENTIONED, note: note_on_confidential_issue)
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'does not create a directly addressed todo if user can not see the issue when leaving a note on a confidential issue' do
|
|
|
|
service.new_note(addressed_note_on_confidential_issue, john_doe)
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
should_create_todo(user: author, target: confidential_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED, note: addressed_note_on_confidential_issue)
|
|
|
|
should_create_todo(user: assignee, target: confidential_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED, note: addressed_note_on_confidential_issue)
|
|
|
|
should_create_todo(user: member, target: confidential_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED, note: addressed_note_on_confidential_issue)
|
2021-01-29 00:20:46 +05:30
|
|
|
should_not_create_todo(user: admin, target: confidential_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED, note: addressed_note_on_confidential_issue)
|
2017-08-17 22:00:37 +05:30
|
|
|
should_not_create_todo(user: guest, target: confidential_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED, note: addressed_note_on_confidential_issue)
|
|
|
|
should_create_todo(user: john_doe, target: confidential_issue, author: john_doe, action: Todo::DIRECTLY_ADDRESSED, note: addressed_note_on_confidential_issue)
|
|
|
|
end
|
|
|
|
|
2019-09-04 21:01:54 +05:30
|
|
|
context 'commits' do
|
|
|
|
let(:base_commit_todo_attrs) { { target_id: nil, target_type: 'Commit', author: john_doe } }
|
|
|
|
|
|
|
|
context 'leaving a note on a commit in a public project' do
|
|
|
|
let(:project) { create(:project, :repository, :public) }
|
2020-01-01 13:55:28 +05:30
|
|
|
|
2019-09-04 21:01:54 +05:30
|
|
|
it 'creates a todo for each valid mentioned user' do
|
|
|
|
expected_todo = base_commit_todo_attrs.merge(
|
|
|
|
action: Todo::MENTIONED,
|
|
|
|
note: note_on_commit,
|
|
|
|
commit_id: note_on_commit.commit_id
|
|
|
|
)
|
|
|
|
|
|
|
|
service.new_note(note_on_commit, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(expected_todo.merge(user: member))
|
|
|
|
should_create_todo(expected_todo.merge(user: author))
|
|
|
|
should_create_todo(expected_todo.merge(user: john_doe))
|
|
|
|
should_create_todo(expected_todo.merge(user: guest))
|
|
|
|
should_create_todo(expected_todo.merge(user: non_member))
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a directly addressed todo for each valid mentioned user' do
|
|
|
|
expected_todo = base_commit_todo_attrs.merge(
|
|
|
|
action: Todo::DIRECTLY_ADDRESSED,
|
|
|
|
note: addressed_note_on_commit,
|
|
|
|
commit_id: addressed_note_on_commit.commit_id
|
|
|
|
)
|
|
|
|
|
|
|
|
service.new_note(addressed_note_on_commit, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(expected_todo.merge(user: member))
|
|
|
|
should_create_todo(expected_todo.merge(user: author))
|
|
|
|
should_create_todo(expected_todo.merge(user: john_doe))
|
|
|
|
should_create_todo(expected_todo.merge(user: guest))
|
|
|
|
should_create_todo(expected_todo.merge(user: non_member))
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
2019-09-04 21:01:54 +05:30
|
|
|
context 'leaving a note on a commit in a public project with private code' do
|
2020-10-24 23:57:45 +05:30
|
|
|
let_it_be(:project) { create(:project, :repository, :public, :repository_private) }
|
|
|
|
|
|
|
|
before_all do
|
|
|
|
project.add_guest(guest)
|
|
|
|
project.add_developer(author)
|
|
|
|
project.add_developer(assignee)
|
|
|
|
project.add_developer(member)
|
|
|
|
project.add_developer(john_doe)
|
|
|
|
project.add_developer(skipped)
|
|
|
|
end
|
2019-09-04 21:01:54 +05:30
|
|
|
|
|
|
|
it 'creates a todo for each valid mentioned user' do
|
|
|
|
expected_todo = base_commit_todo_attrs.merge(
|
|
|
|
action: Todo::MENTIONED,
|
|
|
|
note: note_on_commit,
|
|
|
|
commit_id: note_on_commit.commit_id
|
|
|
|
)
|
|
|
|
|
|
|
|
service.new_note(note_on_commit, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(expected_todo.merge(user: member))
|
|
|
|
should_create_todo(expected_todo.merge(user: author))
|
|
|
|
should_create_todo(expected_todo.merge(user: john_doe))
|
|
|
|
should_create_todo(expected_todo.merge(user: guest))
|
|
|
|
should_not_create_todo(expected_todo.merge(user: non_member))
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a directly addressed todo for each valid mentioned user' do
|
|
|
|
expected_todo = base_commit_todo_attrs.merge(
|
|
|
|
action: Todo::DIRECTLY_ADDRESSED,
|
|
|
|
note: addressed_note_on_commit,
|
|
|
|
commit_id: addressed_note_on_commit.commit_id
|
|
|
|
)
|
|
|
|
|
|
|
|
service.new_note(addressed_note_on_commit, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(expected_todo.merge(user: member))
|
|
|
|
should_create_todo(expected_todo.merge(user: author))
|
|
|
|
should_create_todo(expected_todo.merge(user: john_doe))
|
|
|
|
should_create_todo(expected_todo.merge(user: guest))
|
|
|
|
should_not_create_todo(expected_todo.merge(user: non_member))
|
|
|
|
end
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2019-09-04 21:01:54 +05:30
|
|
|
context 'leaving a note on a commit in a private project' do
|
2020-10-24 23:57:45 +05:30
|
|
|
let_it_be(:project) { create(:project, :repository, :private) }
|
|
|
|
|
|
|
|
before_all do
|
|
|
|
project.add_guest(guest)
|
|
|
|
project.add_developer(author)
|
|
|
|
project.add_developer(assignee)
|
|
|
|
project.add_developer(member)
|
|
|
|
project.add_developer(john_doe)
|
|
|
|
project.add_developer(skipped)
|
|
|
|
end
|
2019-09-04 21:01:54 +05:30
|
|
|
|
|
|
|
it 'creates a todo for each valid mentioned user' do
|
|
|
|
expected_todo = base_commit_todo_attrs.merge(
|
|
|
|
action: Todo::MENTIONED,
|
|
|
|
note: note_on_commit,
|
|
|
|
commit_id: note_on_commit.commit_id
|
|
|
|
)
|
|
|
|
|
|
|
|
service.new_note(note_on_commit, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(expected_todo.merge(user: member))
|
|
|
|
should_create_todo(expected_todo.merge(user: author))
|
|
|
|
should_create_todo(expected_todo.merge(user: john_doe))
|
|
|
|
should_not_create_todo(expected_todo.merge(user: guest))
|
|
|
|
should_not_create_todo(expected_todo.merge(user: non_member))
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a directly addressed todo for each valid mentioned user' do
|
|
|
|
expected_todo = base_commit_todo_attrs.merge(
|
|
|
|
action: Todo::DIRECTLY_ADDRESSED,
|
|
|
|
note: addressed_note_on_commit,
|
|
|
|
commit_id: addressed_note_on_commit.commit_id
|
|
|
|
)
|
|
|
|
|
|
|
|
service.new_note(addressed_note_on_commit, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(expected_todo.merge(user: member))
|
|
|
|
should_create_todo(expected_todo.merge(user: author))
|
|
|
|
should_create_todo(expected_todo.merge(user: john_doe))
|
|
|
|
should_not_create_todo(expected_todo.merge(user: guest))
|
|
|
|
should_not_create_todo(expected_todo.merge(user: non_member))
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create todo when leaving a note on snippet' do
|
|
|
|
should_not_create_any_todo { service.new_note(note_on_project_snippet, john_doe) }
|
|
|
|
end
|
|
|
|
end
|
2016-06-16 23:09:34 +05:30
|
|
|
|
|
|
|
describe '#mark_todo' do
|
|
|
|
it 'creates a todo from a issue' do
|
|
|
|
service.mark_todo(unassigned_issue, author)
|
|
|
|
|
|
|
|
should_create_todo(user: author, target: unassigned_issue, action: Todo::MARKED)
|
|
|
|
end
|
|
|
|
end
|
2016-09-13 17:45:13 +05:30
|
|
|
|
|
|
|
describe '#todo_exists?' do
|
|
|
|
it 'returns false when no todo exist for the given issuable' do
|
|
|
|
expect(service.todo_exist?(unassigned_issue, author)).to be_falsy
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns true when a todo exist for the given issuable' do
|
|
|
|
service.mark_todo(unassigned_issue, author)
|
|
|
|
|
|
|
|
expect(service.todo_exist?(unassigned_issue, author)).to be_truthy
|
|
|
|
end
|
|
|
|
end
|
2021-03-08 18:12:59 +05:30
|
|
|
|
|
|
|
context 'when multiple_todos are enabled' do
|
|
|
|
before do
|
|
|
|
stub_feature_flags(multiple_todos: true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a todo even if user already has a pending todo' do
|
|
|
|
create(:todo, :mentioned, user: member, project: project, target: issue, author: author)
|
|
|
|
|
|
|
|
expect { service.update_issue(issue, author) }.to change(member.todos, :count)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates multiple todos if a user is assigned and mentioned in a new issue' do
|
|
|
|
assigned_issue.description = mentions
|
|
|
|
service.new_issue(assigned_issue, author)
|
|
|
|
|
|
|
|
should_create_todo(user: john_doe, target: assigned_issue, action: Todo::ASSIGNED)
|
|
|
|
should_create_todo(user: john_doe, target: assigned_issue, action: Todo::MENTIONED)
|
|
|
|
end
|
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
describe '#reassigned_assignable' do
|
|
|
|
let(:described_method) { :reassigned_assignable }
|
2019-07-31 22:56:46 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
context 'assignable is a merge request' do
|
2020-06-23 00:09:42 +05:30
|
|
|
it_behaves_like 'reassigned target' do
|
|
|
|
let(:target_assigned) { create(:merge_request, source_project: project, author: author, assignees: [john_doe], description: "- [ ] Task 1\n- [ ] Task 2 #{mentions}") }
|
|
|
|
let(:addressed_target_assigned) { create(:merge_request, source_project: project, author: author, assignees: [john_doe], description: "#{directly_addressed}\n- [ ] Task 1\n- [ ] Task 2") }
|
|
|
|
let(:target_unassigned) { create(:merge_request, source_project: project, author: author, assignees: []) }
|
2019-07-31 22:56:46 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
context 'assignable is an issue' do
|
2020-06-23 00:09:42 +05:30
|
|
|
it_behaves_like 'reassigned target' do
|
|
|
|
let(:target_assigned) { create(:issue, project: project, author: author, assignees: [john_doe], description: "- [ ] Task 1\n- [ ] Task 2 #{mentions}") }
|
|
|
|
let(:addressed_target_assigned) { create(:issue, project: project, author: author, assignees: [john_doe], description: "#{directly_addressed}\n- [ ] Task 1\n- [ ] Task 2") }
|
|
|
|
let(:target_unassigned) { create(:issue, project: project, author: author, assignees: []) }
|
2019-07-31 22:56:46 +05:30
|
|
|
end
|
|
|
|
end
|
2020-10-24 23:57:45 +05:30
|
|
|
|
|
|
|
context 'assignable is an alert' do
|
|
|
|
it_behaves_like 'reassigned target' do
|
|
|
|
let(:target_assigned) { create(:alert_management_alert, project: project, assignees: [john_doe]) }
|
|
|
|
let(:addressed_target_assigned) { create(:alert_management_alert, project: project, assignees: [john_doe]) }
|
|
|
|
let(:target_unassigned) { create(:alert_management_alert, project: project, assignees: []) }
|
|
|
|
end
|
|
|
|
end
|
2019-07-31 22:56:46 +05:30
|
|
|
end
|
|
|
|
|
2020-11-24 15:15:51 +05:30
|
|
|
describe '#reassigned_reviewable' do
|
|
|
|
let(:described_method) { :reassigned_reviewable }
|
|
|
|
|
|
|
|
context 'reviewable is a merge request' do
|
|
|
|
it_behaves_like 'reassigned reviewable target' do
|
|
|
|
let(:assigned_reviewers) { [] }
|
|
|
|
let(:target) { create(:merge_request, source_project: project, author: author, reviewers: assigned_reviewers) }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-04-02 18:10:28 +05:30
|
|
|
describe 'Merge Requests' do
|
2021-03-08 18:12:59 +05:30
|
|
|
let(:mentioned_mr) { create(:merge_request, source_project: project, author: author, description: "- [ ] Task 1\n- [ ] Task 2 #{mentions}") }
|
|
|
|
let(:addressed_mr) { create(:merge_request, source_project: project, author: author, description: "#{directly_addressed}\n- [ ] Task 1\n- [ ] Task 2") }
|
|
|
|
let(:assigned_mr) { create(:merge_request, source_project: project, author: author, assignees: [john_doe]) }
|
|
|
|
let(:unassigned_mr) { create(:merge_request, source_project: project, author: author, assignees: []) }
|
2016-04-02 18:10:28 +05:30
|
|
|
|
|
|
|
describe '#new_merge_request' do
|
|
|
|
it 'creates a pending todo if assigned' do
|
2021-03-08 18:12:59 +05:30
|
|
|
service.new_merge_request(assigned_mr, author)
|
2016-04-02 18:10:28 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_create_todo(user: john_doe, target: assigned_mr, action: Todo::ASSIGNED)
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a todo if unassigned' do
|
2021-03-08 18:12:59 +05:30
|
|
|
should_not_create_any_todo { service.new_merge_request(unassigned_mr, author) }
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
it 'creates a todo if assignee is the current user' do
|
|
|
|
service.new_merge_request(assigned_mr, john_doe)
|
|
|
|
|
|
|
|
should_create_todo(user: john_doe, target: assigned_mr, author: john_doe, action: Todo::ASSIGNED)
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a todo for each valid mentioned user' do
|
2021-03-08 18:12:59 +05:30
|
|
|
service.new_merge_request(mentioned_mr, author)
|
2016-04-02 18:10:28 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_create_todo(user: member, target: mentioned_mr, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: guest, target: mentioned_mr, action: Todo::MENTIONED)
|
|
|
|
should_create_todo(user: author, target: mentioned_mr, action: Todo::MENTIONED)
|
|
|
|
should_create_todo(user: john_doe, target: mentioned_mr, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: non_member, target: mentioned_mr, action: Todo::MENTIONED)
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
it 'creates a todo for each valid user based on the type of mention' do
|
2021-03-08 18:12:59 +05:30
|
|
|
mentioned_mr.update!(description: directly_addressed_and_mentioned)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
service.new_merge_request(mentioned_mr, author)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_create_todo(user: member, target: mentioned_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: admin, target: mentioned_mr, action: Todo::MENTIONED)
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a directly addressed todo for each valid addressed user' do
|
2021-03-08 18:12:59 +05:30
|
|
|
service.new_merge_request(addressed_mr, author)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_create_todo(user: member, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: guest, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: author, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: john_doe, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: non_member, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
describe '#update_merge_request' do
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'creates a todo for each valid mentioned user not included in skip_users' do
|
2021-03-08 18:12:59 +05:30
|
|
|
service.update_merge_request(mentioned_mr, author, skip_users)
|
2016-04-02 18:10:28 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_create_todo(user: member, target: mentioned_mr, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: guest, target: mentioned_mr, action: Todo::MENTIONED)
|
|
|
|
should_create_todo(user: john_doe, target: mentioned_mr, action: Todo::MENTIONED)
|
|
|
|
should_create_todo(user: author, target: mentioned_mr, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: non_member, target: mentioned_mr, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: skipped, target: mentioned_mr, action: Todo::MENTIONED)
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'creates a todo for each valid user not included in skip_users based on the type of mention' do
|
2021-03-08 18:12:59 +05:30
|
|
|
mentioned_mr.update!(description: directly_addressed_and_mentioned)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
service.update_merge_request(mentioned_mr, author, skip_users)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_create_todo(user: member, target: mentioned_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: admin, target: mentioned_mr, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: skipped, target: mentioned_mr)
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a directly addressed todo for each valid addressed user not included in skip_users' do
|
2021-03-08 18:12:59 +05:30
|
|
|
service.update_merge_request(addressed_mr, author, skip_users)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_create_todo(user: member, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: guest, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: john_doe, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: author, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: non_member, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: skipped, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a todo if user was already mentioned and todo is pending' do
|
2021-03-08 18:12:59 +05:30
|
|
|
stub_feature_flags(multiple_todos: false)
|
|
|
|
|
|
|
|
create(:todo, :mentioned, user: member, project: project, target: mentioned_mr, author: author)
|
2016-04-02 18:10:28 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
expect { service.update_merge_request(mentioned_mr, author) }.not_to change(member.todos, :count)
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
2016-06-16 23:09:34 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'does not create a todo if user was already mentioned and todo is done' do
|
2021-03-08 18:12:59 +05:30
|
|
|
create(:todo, :mentioned, :done, user: skipped, project: project, target: mentioned_mr, author: author)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
expect { service.update_merge_request(mentioned_mr, author, skip_users) }.not_to change(skipped.todos, :count)
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a directly addressed todo if user was already mentioned or addressed and todo is pending' do
|
2021-03-08 18:12:59 +05:30
|
|
|
stub_feature_flags(multiple_todos: false)
|
|
|
|
|
|
|
|
create(:todo, :directly_addressed, user: member, project: project, target: addressed_mr, author: author)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
expect { service.update_merge_request(addressed_mr, author) }.not_to change(member.todos, :count)
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a directly addressed todo if user was already mentioned or addressed and todo is done' do
|
2021-03-08 18:12:59 +05:30
|
|
|
create(:todo, :directly_addressed, user: skipped, project: project, target: addressed_mr, author: author)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
expect { service.update_merge_request(addressed_mr, author, skip_users) }.not_to change(skipped.todos, :count)
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
2016-06-22 15:30:34 +05:30
|
|
|
context 'with a task list' do
|
|
|
|
it 'does not create todo when tasks are marked as completed' do
|
2021-03-08 18:12:59 +05:30
|
|
|
mentioned_mr.update!(description: "- [x] Task 1\n- [X] Task 2 #{mentions}")
|
2016-06-16 23:09:34 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
service.update_merge_request(mentioned_mr, author)
|
2016-06-16 23:09:34 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_not_create_todo(user: admin, target: mentioned_mr, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: assignee, target: mentioned_mr, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: author, target: mentioned_mr, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: john_doe, target: mentioned_mr, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: member, target: mentioned_mr, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: non_member, target: mentioned_mr, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: guest, target: mentioned_mr, action: Todo::MENTIONED)
|
2016-06-22 15:30:34 +05:30
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'does not create directly addressed todo when tasks are marked as completed' do
|
2021-03-08 18:12:59 +05:30
|
|
|
addressed_mr.update!(description: "#{directly_addressed}\n- [x] Task 1\n- [X] Task 2")
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
service.update_merge_request(addressed_mr, author)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_not_create_todo(user: admin, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: assignee, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: author, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: john_doe, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: member, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: non_member, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: guest, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
2016-06-22 15:30:34 +05:30
|
|
|
it 'does not raise an error when description not change' do
|
2021-03-08 18:12:59 +05:30
|
|
|
mentioned_mr.update!(title: 'Sample')
|
2016-06-22 15:30:34 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
expect { service.update_merge_request(mentioned_mr, author) }.not_to raise_error
|
2016-06-22 15:30:34 +05:30
|
|
|
end
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
describe '#close_merge_request' do
|
|
|
|
it 'marks related pending todos to the target for the user as done' do
|
2021-03-08 18:12:59 +05:30
|
|
|
first_todo = create(:todo, :assigned, user: john_doe, project: project, target: mentioned_mr, author: author)
|
|
|
|
second_todo = create(:todo, :assigned, user: john_doe, project: project, target: mentioned_mr, author: author)
|
|
|
|
service.close_merge_request(mentioned_mr, john_doe)
|
2016-04-02 18:10:28 +05:30
|
|
|
|
|
|
|
expect(first_todo.reload).to be_done
|
|
|
|
expect(second_todo.reload).to be_done
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#merge_merge_request' do
|
|
|
|
it 'marks related pending todos to the target for the user as done' do
|
2021-03-08 18:12:59 +05:30
|
|
|
first_todo = create(:todo, :assigned, user: john_doe, project: project, target: mentioned_mr, author: author)
|
|
|
|
second_todo = create(:todo, :assigned, user: john_doe, project: project, target: mentioned_mr, author: author)
|
|
|
|
service.merge_merge_request(mentioned_mr, john_doe)
|
2016-04-02 18:10:28 +05:30
|
|
|
|
|
|
|
expect(first_todo.reload).to be_done
|
|
|
|
expect(second_todo.reload).to be_done
|
|
|
|
end
|
2016-11-03 12:29:30 +05:30
|
|
|
|
|
|
|
it 'does not create todo for guests' do
|
2021-03-08 18:12:59 +05:30
|
|
|
service.merge_merge_request(mentioned_mr, john_doe)
|
|
|
|
should_not_create_todo(user: guest, target: mentioned_mr, action: Todo::MENTIONED)
|
2016-11-03 12:29:30 +05:30
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
it 'does not create directly addressed todo for guests' do
|
2021-03-08 18:12:59 +05:30
|
|
|
service.merge_merge_request(addressed_mr, john_doe)
|
|
|
|
should_not_create_todo(user: guest, target: addressed_mr, action: Todo::DIRECTLY_ADDRESSED)
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
describe '#new_award_emoji' do
|
|
|
|
it 'marks related pending todos to the target for the user as done' do
|
2021-03-08 18:12:59 +05:30
|
|
|
todo = create(:todo, user: john_doe, project: project, target: mentioned_mr, author: author)
|
|
|
|
service.new_award_emoji(mentioned_mr, john_doe)
|
2016-06-16 23:09:34 +05:30
|
|
|
|
|
|
|
expect(todo.reload).to be_done
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-06-02 11:05:42 +05:30
|
|
|
describe '#merge_request_build_failed' do
|
2021-03-08 18:12:59 +05:30
|
|
|
let(:merge_participants) { [unassigned_mr.author, admin] }
|
2016-06-02 11:05:42 +05:30
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
before do
|
2021-03-08 18:12:59 +05:30
|
|
|
allow(unassigned_mr).to receive(:merge_participants).and_return(merge_participants)
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
it 'creates a pending todo for each merge_participant' do
|
2021-03-08 18:12:59 +05:30
|
|
|
service.merge_request_build_failed(unassigned_mr)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
merge_participants.each do |participant|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_create_todo(user: participant, author: participant, target: unassigned_mr, action: Todo::BUILD_FAILED)
|
2018-11-08 19:23:39 +05:30
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
describe '#merge_request_push' do
|
|
|
|
it 'marks related pending todos to the target for the user as done' do
|
2021-03-08 18:12:59 +05:30
|
|
|
first_todo = create(:todo, :build_failed, user: author, project: project, target: mentioned_mr, author: john_doe)
|
|
|
|
second_todo = create(:todo, :build_failed, user: john_doe, project: project, target: mentioned_mr, author: john_doe)
|
|
|
|
service.merge_request_push(mentioned_mr, author)
|
2016-06-02 11:05:42 +05:30
|
|
|
|
|
|
|
expect(first_todo.reload).to be_done
|
|
|
|
expect(second_todo.reload).not_to be_done
|
|
|
|
end
|
|
|
|
end
|
2016-06-16 23:09:34 +05:30
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
describe '#merge_request_became_unmergeable' do
|
2018-11-08 19:23:39 +05:30
|
|
|
let(:merge_participants) { [admin, create(:user)] }
|
|
|
|
|
|
|
|
before do
|
2021-03-08 18:12:59 +05:30
|
|
|
allow(unassigned_mr).to receive(:merge_participants).and_return(merge_participants)
|
2018-11-08 19:23:39 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a pending todo for each merge_participant' do
|
2021-03-08 18:12:59 +05:30
|
|
|
unassigned_mr.update!(merge_when_pipeline_succeeds: true, merge_user: admin)
|
|
|
|
service.merge_request_became_unmergeable(unassigned_mr)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
merge_participants.each do |participant|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_create_todo(user: participant, author: participant, target: unassigned_mr, action: Todo::UNMERGEABLE)
|
2018-11-08 19:23:39 +05:30
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-06-16 23:09:34 +05:30
|
|
|
describe '#mark_todo' do
|
|
|
|
it 'creates a todo from a merge request' do
|
2021-03-08 18:12:59 +05:30
|
|
|
service.mark_todo(unassigned_mr, author)
|
2016-06-16 23:09:34 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_create_todo(user: author, target: unassigned_mr, action: Todo::MARKED)
|
2016-06-16 23:09:34 +05:30
|
|
|
end
|
|
|
|
end
|
2016-08-24 12:49:21 +05:30
|
|
|
|
|
|
|
describe '#new_note' do
|
2020-10-24 23:57:45 +05:30
|
|
|
let_it_be(:project) { create(:project, :repository) }
|
|
|
|
|
|
|
|
before_all do
|
|
|
|
project.add_guest(guest)
|
|
|
|
project.add_developer(author)
|
|
|
|
project.add_developer(assignee)
|
|
|
|
project.add_developer(member)
|
|
|
|
project.add_developer(john_doe)
|
|
|
|
project.add_developer(skipped)
|
|
|
|
end
|
|
|
|
|
2016-08-24 12:49:21 +05:30
|
|
|
let(:mention) { john_doe.to_reference }
|
2021-03-08 18:12:59 +05:30
|
|
|
let(:diff_note_on_merge_request) { create(:diff_note_on_merge_request, project: project, noteable: unassigned_mr, author: author, note: "Hey #{mention}") }
|
|
|
|
let(:addressed_diff_note_on_merge_request) { create(:diff_note_on_merge_request, project: project, noteable: unassigned_mr, author: author, note: "#{mention}, hey!") }
|
|
|
|
let(:legacy_diff_note_on_merge_request) { create(:legacy_diff_note_on_merge_request, project: project, noteable: unassigned_mr, author: author, note: "Hey #{mention}") }
|
2016-08-24 12:49:21 +05:30
|
|
|
|
|
|
|
it 'creates a todo for mentioned user on new diff note' do
|
|
|
|
service.new_note(diff_note_on_merge_request, author)
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_create_todo(user: john_doe, target: unassigned_mr, author: author, action: Todo::MENTIONED, note: diff_note_on_merge_request)
|
2016-08-24 12:49:21 +05:30
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
it 'creates a directly addressed todo for addressed user on new diff note' do
|
|
|
|
service.new_note(addressed_diff_note_on_merge_request, author)
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_create_todo(user: john_doe, target: unassigned_mr, author: author, action: Todo::DIRECTLY_ADDRESSED, note: addressed_diff_note_on_merge_request)
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
2016-08-24 12:49:21 +05:30
|
|
|
it 'creates a todo for mentioned user on legacy diff note' do
|
|
|
|
service.new_note(legacy_diff_note_on_merge_request, author)
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_create_todo(user: john_doe, target: unassigned_mr, author: author, action: Todo::MENTIONED, note: legacy_diff_note_on_merge_request)
|
2016-08-24 12:49:21 +05:30
|
|
|
end
|
2016-11-03 12:29:30 +05:30
|
|
|
|
|
|
|
it 'does not create todo for guests' do
|
2021-03-08 18:12:59 +05:30
|
|
|
note_on_merge_request = create :note_on_merge_request, project: project, noteable: mentioned_mr, note: mentions
|
2016-11-03 12:29:30 +05:30
|
|
|
service.new_note(note_on_merge_request, author)
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
should_not_create_todo(user: guest, target: mentioned_mr, action: Todo::MENTIONED)
|
2016-11-03 12:29:30 +05:30
|
|
|
end
|
2016-08-24 12:49:21 +05:30
|
|
|
end
|
2016-04-02 18:10:28 +05:30
|
|
|
end
|
|
|
|
|
2020-05-24 23:13:21 +05:30
|
|
|
describe 'Designs' do
|
|
|
|
include DesignManagementTestHelpers
|
|
|
|
|
|
|
|
let(:issue) { create(:issue, project: project) }
|
|
|
|
let(:design) { create(:design, issue: issue) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
enable_design_management
|
|
|
|
|
|
|
|
project.add_guest(author)
|
|
|
|
project.add_developer(john_doe)
|
|
|
|
end
|
|
|
|
|
|
|
|
let(:note) do
|
|
|
|
build(:diff_note_on_design,
|
|
|
|
noteable: design,
|
|
|
|
author: author,
|
|
|
|
note: "Hey #{john_doe.to_reference}")
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a todo for mentioned user on new diff note' do
|
|
|
|
service.new_note(note, author)
|
|
|
|
|
|
|
|
should_create_todo(user: john_doe,
|
|
|
|
target: design,
|
|
|
|
action: Todo::MENTIONED,
|
|
|
|
note: note)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
describe '#update_note' do
|
2021-04-29 21:17:54 +05:30
|
|
|
let_it_be(:noteable) { create(:issue, project: project) }
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
let(:note) { create(:note, project: project, note: mentions, noteable: noteable) }
|
|
|
|
let(:addressed_note) { create(:note, project: project, note: "#{directly_addressed}", noteable: noteable) }
|
|
|
|
|
|
|
|
it 'creates a todo for each valid mentioned user not included in skip_users' do
|
|
|
|
service.update_note(note, author, skip_users)
|
|
|
|
|
|
|
|
should_create_todo(user: member, target: noteable, action: Todo::MENTIONED)
|
|
|
|
should_create_todo(user: guest, target: noteable, action: Todo::MENTIONED)
|
|
|
|
should_create_todo(user: john_doe, target: noteable, action: Todo::MENTIONED)
|
|
|
|
should_create_todo(user: author, target: noteable, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: non_member, target: noteable, action: Todo::MENTIONED)
|
|
|
|
should_not_create_todo(user: skipped, target: noteable, action: Todo::MENTIONED)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a todo for each valid user not included in skip_users based on the type of mention' do
|
2021-01-29 00:20:46 +05:30
|
|
|
note.update!(note: directly_addressed_and_mentioned)
|
2017-08-17 22:00:37 +05:30
|
|
|
|
|
|
|
service.update_note(note, author, skip_users)
|
|
|
|
|
|
|
|
should_create_todo(user: member, target: noteable, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: guest, target: noteable, action: Todo::MENTIONED)
|
2021-01-29 00:20:46 +05:30
|
|
|
should_not_create_todo(user: admin, target: noteable, action: Todo::MENTIONED)
|
2017-08-17 22:00:37 +05:30
|
|
|
should_not_create_todo(user: skipped, target: noteable)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'creates a directly addressed todo for each valid addressed user not included in skip_users' do
|
|
|
|
service.update_note(addressed_note, author, skip_users)
|
|
|
|
|
|
|
|
should_create_todo(user: member, target: noteable, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: guest, target: noteable, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: john_doe, target: noteable, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_create_todo(user: author, target: noteable, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: non_member, target: noteable, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
should_not_create_todo(user: skipped, target: noteable, action: Todo::DIRECTLY_ADDRESSED)
|
|
|
|
end
|
|
|
|
|
2021-04-29 21:17:54 +05:30
|
|
|
context 'users already have pending todos and the multiple_todos feature is off' do
|
|
|
|
before do
|
|
|
|
stub_feature_flags(multiple_todos: false)
|
|
|
|
end
|
|
|
|
|
|
|
|
let_it_be(:pending_todo_for_member) { create(:todo, :mentioned, user: member, project: project, target: noteable) }
|
|
|
|
let_it_be(:pending_todo_for_guest) { create(:todo, :mentioned, user: guest, project: project, target: noteable) }
|
|
|
|
let_it_be(:pending_todo_for_admin) { create(:todo, :mentioned, user: admin, project: project, target: noteable) }
|
|
|
|
let_it_be(:note_mentioning_1_user) do
|
|
|
|
create(:note, project: project, note: "FYI #{member.to_reference}", noteable: noteable)
|
|
|
|
end
|
2021-03-08 18:12:59 +05:30
|
|
|
|
2021-04-29 21:17:54 +05:30
|
|
|
let_it_be(:note_mentioning_3_users) do
|
|
|
|
create(:note, project: project, note: 'FYI: ' + [member, guest, admin].map(&:to_reference).join(' '), noteable: noteable)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a todo if user was already mentioned and todo is pending' do
|
|
|
|
expect { service.update_note(note_mentioning_1_user, author, skip_users) }.not_to change(member.todos, :count)
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
|
2021-04-29 21:17:54 +05:30
|
|
|
it 'does not create N+1 queries for pending todos' do
|
|
|
|
# Excluding queries for user permissions because those do execute N+1 queries
|
|
|
|
allow_any_instance_of(User).to receive(:can?).and_return(true)
|
|
|
|
|
|
|
|
control_count = ActiveRecord::QueryRecorder.new { service.update_note(note_mentioning_1_user, author, skip_users) }.count
|
|
|
|
|
|
|
|
expect { service.update_note(note_mentioning_3_users, author, skip_users) }.not_to exceed_query_limit(control_count)
|
|
|
|
end
|
2017-08-17 22:00:37 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a todo if user was already mentioned and todo is done' do
|
|
|
|
create(:todo, :mentioned, :done, user: skipped, project: project, target: noteable, author: author)
|
|
|
|
|
|
|
|
expect { service.update_note(note, author, skip_users) }.not_to change(skipped.todos, :count)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a directly addressed todo if user was already mentioned or addressed and todo is pending' do
|
2021-03-08 18:12:59 +05:30
|
|
|
stub_feature_flags(multiple_todos: false)
|
|
|
|
|
2017-08-17 22:00:37 +05:30
|
|
|
create(:todo, :directly_addressed, user: member, project: project, target: noteable, author: author)
|
|
|
|
|
|
|
|
expect { service.update_note(addressed_note, author, skip_users) }.not_to change(member.todos, :count)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not create a directly addressed todo if user was already mentioned or addressed and todo is done' do
|
|
|
|
create(:todo, :directly_addressed, :done, user: skipped, project: project, target: noteable, author: author)
|
|
|
|
|
|
|
|
expect { service.update_note(addressed_note, author, skip_users) }.not_to change(skipped.todos, :count)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-06-22 15:30:34 +05:30
|
|
|
it 'updates cached counts when a todo is created' do
|
2021-03-08 18:12:59 +05:30
|
|
|
issue = create(:issue, project: project, assignees: [john_doe], author: author)
|
2016-06-22 15:30:34 +05:30
|
|
|
|
2021-04-29 21:17:54 +05:30
|
|
|
expect_next(Users::UpdateTodoCountCacheService, [john_doe]).to receive(:execute)
|
2016-06-22 15:30:34 +05:30
|
|
|
|
|
|
|
service.new_issue(issue, author)
|
|
|
|
end
|
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
shared_examples 'updating todos state' do |state, new_state, new_resolved_by = nil|
|
|
|
|
let!(:first_todo) { create(:todo, state, user: john_doe) }
|
|
|
|
let!(:second_todo) { create(:todo, state, user: john_doe) }
|
|
|
|
let(:collection) { Todo.all }
|
2016-09-13 17:45:13 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
it 'updates related todos for the user with the new_state' do
|
|
|
|
method_call
|
2016-09-13 17:45:13 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
expect(collection.all? { |todo| todo.reload.state?(new_state)}).to be_truthy
|
2016-09-13 17:45:13 +05:30
|
|
|
end
|
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
if new_resolved_by
|
|
|
|
it 'updates resolution mechanism' do
|
|
|
|
method_call
|
2016-09-13 17:45:13 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
expect(collection.all? { |todo| todo.reload.resolved_by_action == new_resolved_by }).to be_truthy
|
|
|
|
end
|
2016-09-13 17:45:13 +05:30
|
|
|
end
|
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
it 'returns the updated ids' do
|
|
|
|
expect(method_call).to match_array([first_todo.id, second_todo.id])
|
2016-09-13 17:45:13 +05:30
|
|
|
end
|
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
describe 'cached counts' do
|
|
|
|
it 'updates when todos change' do
|
|
|
|
expect(john_doe.todos.where(state: new_state).count).to eq(0)
|
|
|
|
expect(john_doe.todos.where(state: state).count).to eq(2)
|
|
|
|
expect(john_doe).to receive(:update_todos_count_cache).and_call_original
|
2016-09-29 09:46:39 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
method_call
|
2016-09-29 09:46:39 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
expect(john_doe.todos.where(state: new_state).count).to eq(2)
|
|
|
|
expect(john_doe.todos.where(state: state).count).to eq(0)
|
2016-09-29 09:46:39 +05:30
|
|
|
end
|
|
|
|
end
|
2017-09-10 17:25:29 +05:30
|
|
|
end
|
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
describe '#resolve_todos' do
|
|
|
|
it_behaves_like 'updating todos state', :pending, :done, 'mark_done' do
|
|
|
|
subject(:method_call) do
|
|
|
|
service.resolve_todos(collection, john_doe, resolution: :done, resolved_by_action: :mark_done)
|
2020-01-01 13:55:28 +05:30
|
|
|
end
|
2020-06-23 00:09:42 +05:30
|
|
|
end
|
|
|
|
end
|
2020-01-01 13:55:28 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
describe '#restore_todos' do
|
|
|
|
it_behaves_like 'updating todos state', :done, :pending do
|
|
|
|
subject(:method_call) do
|
|
|
|
service.restore_todos(collection, john_doe)
|
2020-01-01 13:55:28 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
describe '#resolve_todo' do
|
|
|
|
let!(:todo) { create(:todo, :assigned, user: john_doe) }
|
2020-01-01 13:55:28 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
it 'marks pending todo as done' do
|
|
|
|
expect do
|
|
|
|
service.resolve_todo(todo, john_doe)
|
|
|
|
todo.reload
|
|
|
|
end.to change { todo.done? }.to(true)
|
|
|
|
end
|
2020-01-01 13:55:28 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
it 'saves resolution mechanism' do
|
|
|
|
expect do
|
|
|
|
service.resolve_todo(todo, john_doe, resolved_by_action: :mark_done)
|
|
|
|
todo.reload
|
|
|
|
end.to change { todo.resolved_by_mark_done? }.to(true)
|
2020-01-01 13:55:28 +05:30
|
|
|
end
|
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
context 'cached counts' do
|
|
|
|
it 'updates when todos change' do
|
|
|
|
expect(john_doe.todos_done_count).to eq(0)
|
|
|
|
expect(john_doe.todos_pending_count).to eq(1)
|
|
|
|
expect(john_doe).to receive(:update_todos_count_cache).and_call_original
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
service.resolve_todo(todo, john_doe)
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
expect(john_doe.todos_done_count).to eq(1)
|
|
|
|
expect(john_doe.todos_pending_count).to eq(0)
|
|
|
|
end
|
2017-09-10 17:25:29 +05:30
|
|
|
end
|
2020-06-23 00:09:42 +05:30
|
|
|
end
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
describe '#restore_todo' do
|
|
|
|
let!(:todo) { create(:todo, :done, user: john_doe) }
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
it 'marks resolved todo as pending' do
|
|
|
|
expect do
|
|
|
|
service.restore_todo(todo, john_doe)
|
|
|
|
todo.reload
|
|
|
|
end.to change { todo.pending? }.to(true)
|
2017-09-10 17:25:29 +05:30
|
|
|
end
|
2016-09-29 09:46:39 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
context 'cached counts' do
|
|
|
|
it 'updates when todos change' do
|
|
|
|
expect(john_doe.todos_done_count).to eq(1)
|
|
|
|
expect(john_doe.todos_pending_count).to eq(0)
|
|
|
|
expect(john_doe).to receive(:update_todos_count_cache).and_call_original
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
service.restore_todo(todo, john_doe)
|
2016-09-13 17:45:13 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
expect(john_doe.todos_done_count).to eq(0)
|
|
|
|
expect(john_doe.todos_pending_count).to eq(1)
|
|
|
|
end
|
2016-09-13 17:45:13 +05:30
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2021-03-11 19:13:27 +05:30
|
|
|
describe '#create_request_review_todo' do
|
|
|
|
let(:target) { create(:merge_request, author: author, source_project: project) }
|
|
|
|
let(:reviewer) { create(:user) }
|
|
|
|
|
|
|
|
it 'creates a todo for reviewer' do
|
|
|
|
service.create_request_review_todo(target, author, reviewer)
|
|
|
|
|
|
|
|
should_create_todo(user: reviewer, target: target, action: Todo::REVIEW_REQUESTED)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-04-02 18:10:28 +05:30
|
|
|
def should_create_todo(attributes = {})
|
|
|
|
attributes.reverse_merge!(
|
|
|
|
project: project,
|
|
|
|
author: author,
|
|
|
|
state: :pending
|
|
|
|
)
|
|
|
|
|
|
|
|
expect(Todo.where(attributes).count).to eq 1
|
|
|
|
end
|
|
|
|
|
|
|
|
def should_not_create_todo(attributes = {})
|
|
|
|
attributes.reverse_merge!(
|
|
|
|
project: project,
|
|
|
|
author: author,
|
|
|
|
state: :pending
|
|
|
|
)
|
|
|
|
|
|
|
|
expect(Todo.where(attributes).count).to eq 0
|
|
|
|
end
|
|
|
|
|
|
|
|
def should_not_create_any_todo
|
|
|
|
expect { yield }.not_to change(Todo, :count)
|
|
|
|
end
|
|
|
|
end
|