diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-04 16:10:28 +0200 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-04 16:28:39 +0200 |
commit | 8008f1231573eca507d9ddb77328d9b3a9ee566b (patch) | |
tree | 7380f53ae7ecf7cd7e9a1503dc6e743a87ea987c | |
parent | 0360671c55969d159e03e3b661906cbaa66c8f2e (diff) | |
download | gitlab-ce-8008f1231573eca507d9ddb77328d9b3a9ee566b.tar.gz |
Fix specs
-rw-r--r-- | app/models/ci/build.rb | 2 | ||||
-rw-r--r-- | spec/services/create_deployment_service_spec.rb | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 162b426a485..e4e162fcf61 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -562,7 +562,7 @@ module Ci def yaml_variables=(value) if Feature.enabled?(:ci_use_build_metadata_for_config) # save and remove from this model - ensure_metadata.yaml_variables = value + ensure_metadata.json_variables = value write_attribute(:yaml_variables, nil) else super diff --git a/spec/services/create_deployment_service_spec.rb b/spec/services/create_deployment_service_spec.rb index b9bfbb11511..90479a19bad 100644 --- a/spec/services/create_deployment_service_spec.rb +++ b/spec/services/create_deployment_service_spec.rb @@ -9,7 +9,7 @@ describe CreateDeploymentService do ref: 'master', tag: false, environment: 'production', - options: { environment: options }) + options: { script: ["bash"], environment: options }) end let(:project) { job.project } @@ -165,6 +165,10 @@ describe CreateDeploymentService do options: { environment: { url: 'http://review/$APP_HOST' } }) end + before do + job.reload + end + it { is_expected.to eq('http://review/host') } end |