diff options
author | Rémy Coutable <remy@rymai.me> | 2019-04-03 12:45:31 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-04-03 12:45:31 +0300 |
commit | b1f9e05a73e256e24c9e71076e736b22a39e2960 (patch) | |
tree | ff4b02db50c388b8d30f3f95ce7facbd0f1526b7 /spec/models | |
parent | 478077747da82a3dfaafbebc1797b26b965b030f (diff) | |
parent | 0e5dbaf87f4f6f511eee469139e57d896164846c (diff) |
Merge branch '55268-exclude-system-notes-from-commits-in-mr' into 'master'
Do not show system notes on commits in the MR page
Closes #55268
See merge request gitlab-org/gitlab-ce!26396
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/merge_request_spec.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 892fdc4e4e9..6f34ef9c1bc 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -805,6 +805,14 @@ describe MergeRequest do expect(merge_request.commits).not_to be_empty expect(merge_request.related_notes.count).to eq(3) end + + it "excludes system notes for commits" do + system_note = create(:note_on_commit, :system, commit_id: merge_request.commits.first.id, + project: merge_request.project) + + expect(merge_request.related_notes.count).to eq(2) + expect(merge_request.related_notes).not_to include(system_note) + end end describe '#for_fork?' do |