diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-19 11:02:56 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-19 11:02:56 +0000 |
commit | cf0283c8935986c7182e3b22610eba4f0fb485a1 (patch) | |
tree | 0157248bb1ef4788687e1b11fa53f1b8391f43f9 /spec/lib/ci | |
parent | 7ef7135adf449644beb7ca037b8b8a8132e4c776 (diff) | |
parent | 7023e7665f78d48abc4ed8690a686eab3903ac98 (diff) | |
download | gitlab-ce-issues-copy.tar.gz |
Merge branch 'fix/require-build-script-configuration-entry' into 'master'
issues-copy
Make job script a required configuration entry
## What does this MR do?
This MR makes a job script a required configuration entry.
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
## What are the relevant issue numbers?
Closes #24575
See merge request !7566
Diffstat (limited to 'spec/lib/ci')
-rw-r--r-- | spec/lib/ci/gitlab_ci_yaml_processor_spec.rb | 4 |
1 files changed, 2 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 84f21631719..ff5dcc06ab3 100644 --- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb +++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb @@ -1124,8 +1124,8 @@ EOT end.to raise_error(GitlabCiYamlProcessor::ValidationError, "jobs:extra config should be a hash") end - it "returns errors if there are unknown parameters that are hashes, but doesn't have a script" do - config = YAML.dump({ extra: { services: "test" } }) + it "returns errors if services configuration is not correct" do + config = YAML.dump({ extra: { script: 'rspec', services: "test" } }) expect do GitlabCiYamlProcessor.new(config, path) end.to raise_error(GitlabCiYamlProcessor::ValidationError, "jobs:extra:services config should be an array of strings") |