Commit 94190461 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Fix specs

parent 0aa6061d
...@@ -187,7 +187,7 @@ module Ci ...@@ -187,7 +187,7 @@ module Ci
end end
if job[:when] && !job[:when].in?(%w(on_success on_failure always)) 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
end end
......
...@@ -24,7 +24,8 @@ module Ci ...@@ -24,7 +24,8 @@ module Ci
commands: "pwd\nrspec", commands: "pwd\nrspec",
tag_list: [], tag_list: [],
options: {}, options: {},
allow_failure: false allow_failure: false,
when: "on_success"
}) })
end end
...@@ -330,7 +331,7 @@ module Ci ...@@ -330,7 +331,7 @@ module Ci
end end
it "returns errors if job when is not on_success, on_failure or always" do 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 expect do
GitlabCiYamlProcessor.new(config) GitlabCiYamlProcessor.new(config)
end.to raise_error(GitlabCiYamlProcessor::ValidationError, "rspec job: when parameter should be on_success, on_failure or always") end.to raise_error(GitlabCiYamlProcessor::ValidationError, "rspec job: when parameter should be on_success, on_failure or always")
......
...@@ -248,7 +248,7 @@ describe Ci::Commit do ...@@ -248,7 +248,7 @@ describe Ci::Commit do
end end
context 'properly creates builds "when" is defined' do context 'properly creates builds "when" is defined' do
let(:yaml) { let(:yaml) do
{ {
stages: ["build", "test", "test_failure", "deploy", "cleanup"], stages: ["build", "test", "test_failure", "deploy", "cleanup"],
build: { build: {
...@@ -274,7 +274,7 @@ describe Ci::Commit do ...@@ -274,7 +274,7 @@ describe Ci::Commit do
when: "always", when: "always",
} }
} }
} end
before do before do
stub_ci_commit_yaml_file(YAML.dump(yaml)) 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