Rename special deploy token to make it more descriptive

Also:
- Includes more specs
- Improves a bit the documentation

2 files changed, 11 insertions, 7 deletions

diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index b68297bfabc..e70f5b26440 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -2041,27 +2041,25 @@ describe Ci::Build do
 
       let(:deploy_token_variables) do
         [
-          { key: 'CI_DEPLOY_USER', value: DeployToken::GITLAB_DEPLOY_TOKEN, public: true },
+          { key: 'CI_DEPLOY_USER', value: DeployToken::GITLAB_DEPLOY_TOKEN_NAME, public: true },
           { key: 'CI_DEPLOY_PASSWORD', value: deploy_token.token, public: true }
         ]
       end
 
-      context 'when gitlab-deploy-token exist' do
+      context 'when gitlab-deploy-token exists' do
         before do
           project.deploy_tokens << deploy_token
         end
 
         it 'should include deploy token variables' do
-          deploy_token_variables.each do |deploy_token_variable|
-            is_expected.to include(deploy_token_variable)
-          end
+          is_expected.to include(*deploy_token_variables)
         end
       end
 
       context 'when gitlab-deploy-token does not exist' do
         it 'should not include deploy token variables' do
-          deploy_token_variables.each do |deploy_token_variable|
-            is_expected.not_to include(deploy_token_variable)
+          %w(CI_DEPLOY_USER CI_DEPLOY_PASSWORD).each do |deploy_token_key|
+            expect(subject.find { |v| v[:key] == deploy_token_key}).to be_nil
           end
         end
       end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 86ad80106af..f8b2fbf7399 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -3611,5 +3611,11 @@ describe Project do
 
       it { is_expected.to be_nil }
     end
+
+    context 'when there is a gitlab deploy token associated with a different name' do
+      let!(:deploy_token) { create(:deploy_token, projects: [project]) }
+
+      it { is_expected.to be_nil }
+    end
   end
 end