Commit 94190461 authored by Kamil Trzcinski's avatar Kamil Trzcinski
Browse files

Fix specs

parent 0620f7cdb050
......@@ -187,7 +187,7 @@ def validate_job!(name, job)
end
if job[:when] && !job[:when].in?(%w(on_success on_failure always))
raise ValidationError, "#{name}: when should be on_success, on_failure or always"
raise ValidationError, "#{name}: when parameter should be on_success, on_failure or always"
end
end
......
......@@ -24,7 +24,8 @@ module Ci
commands: "pwd\nrspec",
tag_list: [],
options: {},
allow_failure: false
allow_failure: false,
when: "on_success"
})
end
......@@ -330,7 +331,7 @@ module Ci
end
it "returns errors if job when is not on_success, on_failure or always" do
config = YAML.dump({ rspec: { script: "test", when: false } })
config = YAML.dump({ rspec: { script: "test", when: 1 } })
expect do
GitlabCiYamlProcessor.new(config)
end.to raise_error(GitlabCiYamlProcessor::ValidationError, "rspec job: when parameter should be on_success, on_failure or always")
......
......@@ -248,7 +248,7 @@ def create_develop_builds
end
context 'properly creates builds "when" is defined' do
let(:yaml) {
let(:yaml) do
{
stages: ["build", "test", "test_failure", "deploy", "cleanup"],
build: {
......@@ -274,7 +274,7 @@ def create_develop_builds
when: "always",
}
}
}
end
before do
stub_ci_commit_yaml_file(YAML.dump(yaml))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment