Commit 0420c239 authored by Luke Duncalfe's avatar Luke Duncalfe

Scope out merge commits in MergeRequest spec

Previously the code for excluding merge commits from the commit
collection (CommitCollection#without_merge_commits) was not working
when the commits had come from a merge request. Now that this has been
fixed, these tests fails. They should always have been written to
exclude merge commits when comparing.
parent 8ef0a9d5
...@@ -1040,7 +1040,7 @@ describe MergeRequest do ...@@ -1040,7 +1040,7 @@ describe MergeRequest do
describe '#commit_authors' do describe '#commit_authors' do
it 'returns all the authors of every commit in the merge request' do it 'returns all the authors of every commit in the merge request' do
users = subject.commits.map(&:author_email).uniq.map do |email| users = subject.commits.without_merge_commits.map(&:author_email).uniq.map do |email|
create(:user, email: email) create(:user, email: email)
end end
...@@ -1054,7 +1054,7 @@ describe MergeRequest do ...@@ -1054,7 +1054,7 @@ describe MergeRequest do
describe '#authors' do describe '#authors' do
it 'returns a list with all the commit authors in the merge request and author' do it 'returns a list with all the commit authors in the merge request and author' do
users = subject.commits.map(&:author_email).uniq.map do |email| users = subject.commits.without_merge_commits.map(&:author_email).uniq.map do |email|
create(:user, email: email) create(:user, email: email)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment