diff options
author | Igor <idrozdov@gitlab.com> | 2019-04-02 14:01:07 +0300 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2019-04-02 14:01:07 +0300 |
commit | 351b39f172bf77f4eb0e84fb2e5a71af9fe72348 (patch) | |
tree | 6ae773097df4469714b0e2e5a7893f760d174f3f /spec/models/commit_collection_spec.rb | |
parent | f21f93f904505a5c5041a2e0f040fdad7107d3df (diff) |
Backport splitting approval changes from CE
Author and committers approvals are split in EE
This commit provides backports for those changes
This reverts commit 886f00bcba23d67e2c86591c2eb5359ef457a2f9.
Diffstat (limited to 'spec/models/commit_collection_spec.rb')
-rw-r--r-- | spec/models/commit_collection_spec.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/spec/models/commit_collection_spec.rb b/spec/models/commit_collection_spec.rb index 8a7fcb39fe2..0bdf83fa90f 100644 --- a/spec/models/commit_collection_spec.rb +++ b/spec/models/commit_collection_spec.rb @@ -14,26 +14,26 @@ describe CommitCollection do end end - describe '.authors' do + describe '.committers' do it 'returns a relation of users when users are found' do - user = create(:user, email: commit.author_email.upcase) + user = create(:user, email: commit.committer_email.upcase) collection = described_class.new(project, [commit]) - expect(collection.authors).to contain_exactly(user) + expect(collection.committers).to contain_exactly(user) end - it 'returns empty array when authors cannot be found' do + it 'returns empty array when committers cannot be found' do collection = described_class.new(project, [commit]) - expect(collection.authors).to be_empty + expect(collection.committers).to be_empty end it 'excludes authors of merge commits' do commit = project.commit("60ecb67744cb56576c30214ff52294f8ce2def98") - create(:user, email: commit.author_email.upcase) + create(:user, email: commit.committer_email.upcase) collection = described_class.new(project, [commit]) - expect(collection.authors).to be_empty + expect(collection.committers).to be_empty end end |