diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2019-08-23 23:50:01 +0300 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2019-08-23 23:50:01 +0300 |
commit | 459309fa57e86599c53d0d3f867053ceb24d432b (patch) | |
tree | 590bcf8118441e8eb39aa13e9bb178809a0ed9ae /spec/models | |
parent | 3203367e4ab0fdc1281dd265d0452178e87ac405 (diff) | |
parent | d86b77bf20474702631d5fd89177c54a9f928760 (diff) |
Merge branch '66037-deployment-user' into 'master'
Return correct user for manual deployments
See merge request gitlab-org/gitlab-ce!32004
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/deployment_spec.rb | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb index d4e631f109b..51ed8e9421b 100644 --- a/spec/models/deployment_spec.rb +++ b/spec/models/deployment_spec.rb @@ -322,4 +322,30 @@ describe Deployment do end end end + + describe '#deployed_by' do + it 'returns the deployment user if there is no deployable' do + deployment_user = create(:user) + deployment = create(:deployment, deployable: nil, user: deployment_user) + + expect(deployment.deployed_by).to eq(deployment_user) + end + + it 'returns the deployment user if the deployable have no user' do + deployment_user = create(:user) + build = create(:ci_build, user: nil) + deployment = create(:deployment, deployable: build, user: deployment_user) + + expect(deployment.deployed_by).to eq(deployment_user) + end + + it 'returns the deployable user if there is one' do + build_user = create(:user) + deployment_user = create(:user) + build = create(:ci_build, user: build_user) + deployment = create(:deployment, deployable: build, user: deployment_user) + + expect(deployment.deployed_by).to eq(build_user) + end + end end |