From 8d1649f77460b1203e6497b91342cc08b93ae160 Mon Sep 17 00:00:00 2001 From: Jason van den Hurk Date: Wed, 10 Apr 2019 12:56:56 +0200 Subject: Change CI_REF_PROTECTED variable to CI_COMMIT_REF_PROTECTED --- spec/models/ci/bridge_spec.rb | 2 +- spec/models/ci/build_spec.rb | 2 +- spec/models/ci/pipeline_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/models/ci') diff --git a/spec/models/ci/bridge_spec.rb b/spec/models/ci/bridge_spec.rb index fce53a96857..44b5af5e5aa 100644 --- a/spec/models/ci/bridge_spec.rb +++ b/spec/models/ci/bridge_spec.rb @@ -33,7 +33,7 @@ describe Ci::Bridge do CI_PROJECT_ID CI_PROJECT_NAME CI_PROJECT_PATH CI_PROJECT_PATH_SLUG CI_PROJECT_NAMESPACE CI_PIPELINE_IID CI_CONFIG_PATH CI_PIPELINE_SOURCE CI_COMMIT_MESSAGE - CI_COMMIT_TITLE CI_COMMIT_DESCRIPTION CI_REF_PROTECTED + CI_COMMIT_TITLE CI_COMMIT_DESCRIPTION CI_COMMIT_REF_PROTECTED ] expect(bridge.scoped_variables_hash.keys).to include(*variables) diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index 4c717357bd0..7af5237a503 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -2228,7 +2228,7 @@ describe Ci::Build do { key: 'CI_COMMIT_MESSAGE', value: pipeline.git_commit_message, public: true, masked: false }, { key: 'CI_COMMIT_TITLE', value: pipeline.git_commit_title, public: true, masked: false }, { key: 'CI_COMMIT_DESCRIPTION', value: pipeline.git_commit_description, public: true, masked: false }, - { key: 'CI_REF_PROTECTED', value: pipeline.protected_ref?.to_s, public: true, masked: false } + { key: 'CI_COMMIT_REF_PROTECTED', value: pipeline.protected_ref?.to_s, public: true, masked: false } ] end diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index 9b86fbbefe8..f3310ff0f82 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -671,7 +671,7 @@ describe Ci::Pipeline, :mailer do CI_COMMIT_MESSAGE CI_COMMIT_TITLE CI_COMMIT_DESCRIPTION - CI_REF_PROTECTED] + CI_COMMIT_REF_PROTECTED] end context 'when source is merge request' do -- cgit v1.2.1