Extract logic who created deployment into Deployment#deployed_by

Prefer the deployable user over the deployment user.

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/66037.

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