diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-05-18 14:19:57 +0200 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-05-18 14:29:57 +0200 |
commit | b5d7937e42126040733fead66f8bc3fabfb5fbe2 (patch) | |
tree | bc5819db9bb0143dac7e01f51fbbb10d35af5733 | |
parent | eb63895f04e85224bd8616588d6fb95da459a614 (diff) | |
download | gitlab-ce-b5d7937e42126040733fead66f8bc3fabfb5fbe2.tar.gz |
Update pipeline persisted / predefined variables specs
-rw-r--r-- | spec/models/ci/build_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/ci/pipeline_spec.rb | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index d7659a9cb58..884fbad6ccf 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -1493,6 +1493,7 @@ describe Ci::Build do let(:container_registry_enabled) { false } let(:predefined_variables) do [ + { key: 'CI_PIPELINE_ID', value: pipeline.id.to_s, public: true }, { key: 'CI_JOB_ID', value: build.id.to_s, public: true }, { key: 'CI_JOB_TOKEN', value: build.token, public: false }, { key: 'CI_BUILD_ID', value: build.id.to_s, public: true }, @@ -1524,7 +1525,6 @@ describe Ci::Build do { key: 'CI_PROJECT_NAMESPACE', value: project.namespace.full_path, public: true }, { key: 'CI_PROJECT_URL', value: project.web_url, public: true }, { key: 'CI_PROJECT_VISIBILITY', value: 'private', public: true }, - { key: 'CI_PIPELINE_ID', value: pipeline.id.to_s, public: true }, { key: 'CI_CONFIG_PATH', value: pipeline.ci_yaml_file_path, public: true }, { key: 'CI_PIPELINE_SOURCE', value: pipeline.source, public: true }, { key: 'CI_COMMIT_MESSAGE', value: pipeline.git_commit_message, public: true }, diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index 0e393aa362b..e4f4c62bd22 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -181,10 +181,10 @@ describe Ci::Pipeline, :mailer do context 'when pipeline is persisted' do subject { build_stubbed(:ci_pipeline).persisted_variables } - it 'does not contain some variables' do + it 'does contains persisted variables' do keys = subject.map { |variable| variable[:key] } - expect(keys).to include 'CI_PIPELINE_ID' + expect(keys).to eq %w[CI_PIPELINE_ID] end end end @@ -195,7 +195,11 @@ describe Ci::Pipeline, :mailer do it 'includes all predefined variables in a valid order' do keys = subject.map { |variable| variable[:key] } - expect(keys).to eq %w[CI_PIPELINE_ID CI_CONFIG_PATH CI_PIPELINE_SOURCE CI_COMMIT_MESSAGE CI_COMMIT_TITLE CI_COMMIT_DESCRIPTION] + expect(keys).to eq %w[CI_CONFIG_PATH + CI_PIPELINE_SOURCE + CI_COMMIT_MESSAGE + CI_COMMIT_TITLE + CI_COMMIT_DESCRIPTION] end end |