diff options
| -rw-r--r-- | app/helpers/system_note_helper.rb | 3 | ||||
| -rw-r--r-- | app/models/system_note_metadata.rb | 2 | ||||
| -rw-r--r-- | app/services/issuable/common_system_notes_service.rb | 5 | ||||
| -rw-r--r-- | app/services/system_note_service.rb | 20 | ||||
| -rw-r--r-- | changelogs/unreleased/38208-due-dates-system-notes.yml | 5 | ||||
| -rw-r--r-- | spec/features/instance_statistics/cohorts_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/projects/members/invite_group_spec.rb | 17 | ||||
| -rw-r--r-- | spec/services/system_note_service_spec.rb | 24 |
8 files changed, 67 insertions, 11 deletions
diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb index 5b4a141dbcf..b0826e23e31 100644 --- a/app/helpers/system_note_helper.rb +++ b/app/helpers/system_note_helper.rb @@ -21,7 +21,8 @@ module SystemNoteHelper 'outdated' => 'pencil-square', 'duplicate' => 'issue-duplicate', 'locked' => 'lock', - 'unlocked' => 'lock-open' + 'unlocked' => 'lock-open', + 'due_date' => 'calendar' }.freeze def system_note_icon_name(note) diff --git a/app/models/system_note_metadata.rb b/app/models/system_note_metadata.rb index 376ef673ca8..6fadbcefa53 100644 --- a/app/models/system_note_metadata.rb +++ b/app/models/system_note_metadata.rb @@ -15,7 +15,7 @@ class SystemNoteMetadata < ActiveRecord::Base commit description merge confidential visible label assignee cross_reference title time_tracking branch milestone discussion task moved opened closed merged duplicate locked unlocked - outdated tag + outdated tag due_date ].freeze validates :note, presence: true diff --git a/app/services/issuable/common_system_notes_service.rb b/app/services/issuable/common_system_notes_service.rb index ab53c38aa3a..765de9c66b0 100644 --- a/app/services/issuable/common_system_notes_service.rb +++ b/app/services/issuable/common_system_notes_service.rb @@ -17,6 +17,7 @@ module Issuable create_labels_note(old_labels) if issuable.labels != old_labels create_discussion_lock_note if issuable.previous_changes.include?('discussion_locked') create_milestone_note if issuable.previous_changes.include?('milestone_id') + create_due_date_note if issuable.previous_changes.include?('due_date') end private @@ -90,6 +91,10 @@ module Issuable SystemNoteService.change_milestone(issuable, issuable.project, current_user, issuable.milestone) end + def create_due_date_note + SystemNoteService.change_due_date(issuable, issuable.project, current_user, issuable.due_date) + end + def create_discussion_lock_note SystemNoteService.discussion_lock(issuable, current_user) end diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb index 3ea81445798..c5d05992575 100644 --- a/app/services/system_note_service.rb +++ b/app/services/system_note_service.rb @@ -119,6 +119,26 @@ module SystemNoteService create_note(NoteSummary.new(noteable, project, author, body, action: 'milestone')) end + # Called when the due_date of a Noteable is changed + # + # noteable - Noteable object + # project - Project owning noteable + # author - User performing the change + # due_date - Due date being assigned, or nil + # + # Example Note text: + # + # "removed due date" + # + # "changed due date to September 20, 2018" + # + # Returns the created Note object + def change_due_date(noteable, project, author, due_date) + body = due_date ? "changed due date to #{due_date.to_s(:long)}" : 'removed due date' + + create_note(NoteSummary.new(noteable, project, author, body, action: 'due_date')) + end + # Called when the estimated time of a Noteable is changed # # noteable - Noteable object diff --git a/changelogs/unreleased/38208-due-dates-system-notes.yml b/changelogs/unreleased/38208-due-dates-system-notes.yml new file mode 100644 index 00000000000..60e09ff64de --- /dev/null +++ b/changelogs/unreleased/38208-due-dates-system-notes.yml @@ -0,0 +1,5 @@ +--- +title: Add system note when due date is changed +merge_request: +author: Eva Kadlecova +type: added diff --git a/spec/features/instance_statistics/cohorts_spec.rb b/spec/features/instance_statistics/cohorts_spec.rb index 81fc5eff980..40e65515ceb 100644 --- a/spec/features/instance_statistics/cohorts_spec.rb +++ b/spec/features/instance_statistics/cohorts_spec.rb @@ -3,6 +3,8 @@ require 'rails_helper' describe 'Cohorts page' do before do sign_in(create(:admin)) + + stub_application_setting(usage_ping_enabled: true) end it 'See users count per month' do diff --git a/spec/features/projects/members/invite_group_spec.rb b/spec/features/projects/members/invite_group_spec.rb index 1ea4934cff1..0fb3eb20b5b 100644 --- a/spec/features/projects/members/invite_group_spec.rb +++ b/spec/features/projects/members/invite_group_spec.rb @@ -17,7 +17,6 @@ describe 'Project > Members > Invite group', :js do shared_examples 'the project cannot be shared with groups' do it 'the "Invite group" tab does not exist' do visit project_settings_members_path(project) - expect(page).to have_selector('#invite-member-tab') expect(page).not_to have_selector('#invite-group-tab') end end @@ -31,7 +30,7 @@ describe 'Project > Members > Invite group', :js do sign_in(maintainer) end - context 'when the group has "Invite group lock" disabled' do + context 'when the group has "Share with group lock" disabled' do it_behaves_like 'the project can be shared with groups' it 'the project can be shared with another group' do @@ -49,7 +48,7 @@ describe 'Project > Members > Invite group', :js do end end - context 'when the group has "Invite group lock" enabled' do + context 'when the group has "Share with group lock" enabled' do before do project.namespace.update_column(:share_with_group_lock, true) end @@ -69,12 +68,12 @@ describe 'Project > Members > Invite group', :js do sign_in(maintainer) end - context 'when the root_group has "Invite group lock" disabled' do - context 'when the subgroup has "Invite group lock" disabled' do + context 'when the root_group has "Share with group lock" disabled' do + context 'when the subgroup has "Share with group lock" disabled' do it_behaves_like 'the project can be shared with groups' end - context 'when the subgroup has "Invite group lock" enabled' do + context 'when the subgroup has "Share with group lock" enabled' do before do subgroup.update_column(:share_with_group_lock, true) end @@ -83,16 +82,16 @@ describe 'Project > Members > Invite group', :js do end end - context 'when the root_group has "Invite group lock" enabled' do + context 'when the root_group has "Share with group lock" enabled' do before do root_group.update_column(:share_with_group_lock, true) end - context 'when the subgroup has "Invite group lock" disabled (parent overridden)' do + context 'when the subgroup has "Share with group lock" disabled (parent overridden)' do it_behaves_like 'the project can be shared with groups' end - context 'when the subgroup has "Invite group lock" enabled' do + context 'when the subgroup has "Share with group lock" enabled' do before do subgroup.update_column(:share_with_group_lock, true) end diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb index d5d750e182b..f4b7cb8c90a 100644 --- a/spec/services/system_note_service_spec.rb +++ b/spec/services/system_note_service_spec.rb @@ -249,6 +249,30 @@ describe SystemNoteService do end end + describe '.change_due_date' do + subject { described_class.change_due_date(noteable, project, author, due_date) } + + let(:due_date) { Date.today } + + it_behaves_like 'a system note' do + let(:action) { 'due_date' } + end + + context 'when due date added' do + it 'sets the note text' do + expect(subject.note).to eq "changed due date to #{Date.today.to_s(:long)}" + end + end + + context 'when due date removed' do + let(:due_date) { nil } + + it 'sets the note text' do + expect(subject.note).to eq 'removed due date' + end + end + end + describe '.change_status' do subject { described_class.change_status(noteable, project, author, status, source) } |