summaryrefslogtreecommitdiff
path: root/spec/models/merge_request_spec.rb
diff options
context:
space:
mode:
authorHeinrich Lee Yu <heinrich@gitlab.com>2019-03-21 12:08:15 +0800
committerHeinrich Lee Yu <heinrich@gitlab.com>2019-04-02 22:59:43 +0800
commit0e5dbaf87f4f6f511eee469139e57d896164846c (patch)
tree3774f7e50c70ee1ab3eb8fc75d922b555260ebbb /spec/models/merge_request_spec.rb
parent723f936fb1805ccd4c0d03f6f8599dbc4a2f5570 (diff)
downloadgitlab-ce-0e5dbaf87f4f6f511eee469139e57d896164846c.tar.gz
Do not show system notes on commits in the MR page55268-exclude-system-notes-from-commits-in-mr
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r--spec/models/merge_request_spec.rb8
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