diff --git a/gems/gitlab-housekeeper/lib/gitlab/housekeeper/change.rb b/gems/gitlab-housekeeper/lib/gitlab/housekeeper/change.rb index 4ca277e7d7c7988119565e6944cdf97a3b5a6ce7..7c40959e5d1c4a4e05428af91ddd79f804859885 100644 --- a/gems/gitlab-housekeeper/lib/gitlab/housekeeper/change.rb +++ b/gems/gitlab-housekeeper/lib/gitlab/housekeeper/change.rb @@ -9,7 +9,8 @@ class Change :changed_files, :labels, :reviewers, - :keep_class + :keep_class, + :changelog_type def initialize @labels = [] @@ -35,7 +36,7 @@ def commit_message #{mr_description} - Changelog: other + Changelog: #{changelog_type || 'other'} MARKDOWN end diff --git a/gems/gitlab-housekeeper/spec/gitlab/housekeeper/change_spec.rb b/gems/gitlab-housekeeper/spec/gitlab/housekeeper/change_spec.rb index d213e89878d22c005a0775b1657e245e5ebcad6e..10e7e61400b92ad5a5236da464be0f2ac44c157b 100644 --- a/gems/gitlab-housekeeper/spec/gitlab/housekeeper/change_spec.rb +++ b/gems/gitlab-housekeeper/spec/gitlab/housekeeper/change_spec.rb @@ -57,6 +57,28 @@ MARKDOWN ) end + + context 'when setting a "changelog_type"' do + before do + change.changelog_type = 'removed' + end + + it 'incudes "Changelog: removed"' do + expect(change.commit_message).to eq( + <<~MARKDOWN + The title + + The description + + This change was generated by + [gitlab-housekeeper](https://gitlab.com/gitlab-org/gitlab/-/tree/master/gems/gitlab-housekeeper) + + + Changelog: removed + MARKDOWN + ) + end + end end describe '#valid?' do