summaryrefslogtreecommitdiff
path: root/spec/lib/ci
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-09-16 11:25:37 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-09-19 10:07:14 +0200
commit2ad7753d34a963abfcadfa42e5d5b4cd59afc221 (patch)
tree55b0190174f7da116e8cb05a8215e8908bff9eea /spec/lib/ci
parent3fbfc30f5e131e950564712d6f0d1837cd7605e3 (diff)
downloadgitlab-ce-2ad7753d34a963abfcadfa42e5d5b4cd59afc221.tar.gz
Fix CI job environment configuration attributes
Diffstat (limited to 'spec/lib/ci')
-rw-r--r--spec/lib/ci/gitlab_ci_yaml_processor_spec.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
index 2ad33007b8a..c139ef36a9a 100644
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
@@ -767,7 +767,7 @@ module Ci
it 'does return production and URL' do
expect(builds.size).to eq(1)
expect(builds.first[:environment]).to eq(environment[:name])
- expect(builds.first[:options]).to include(environment)
+ expect(builds.first[:options]).to include(environment: environment)
end
end
@@ -784,7 +784,8 @@ module Ci
let(:environment) { 1 }
it 'raises error' do
- expect { builds }.to raise_error("jobs:deploy_to_production environment #{Gitlab::Regex.environment_name_regex_message}")
+ expect { builds }.to raise_error(
+ 'jobs:deploy_to_production:environment config should be a hash or a string')
end
end