Commit cc57d610 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Rename finally_script to after_script

parent b340b597
...@@ -4,12 +4,12 @@ module Ci ...@@ -4,12 +4,12 @@ module Ci
DEFAULT_STAGES = %w(build test deploy) DEFAULT_STAGES = %w(build test deploy)
DEFAULT_STAGE = 'test' DEFAULT_STAGE = 'test'
ALLOWED_YAML_KEYS = [:before_script, :finally_script, :image, :services, :types, :stages, :variables, :cache] ALLOWED_YAML_KEYS = [:before_script, :after_script, :image, :services, :types, :stages, :variables, :cache]
ALLOWED_JOB_KEYS = [:tags, :script, :only, :except, :type, :image, :services, ALLOWED_JOB_KEYS = [:tags, :script, :only, :except, :type, :image, :services,
:allow_failure, :type, :stage, :when, :artifacts, :cache, :allow_failure, :type, :stage, :when, :artifacts, :cache,
:dependencies] :dependencies]
attr_reader :before_script, :finally_script, :image, :services, :variables, :path, :cache attr_reader :before_script, :after_script, :image, :services, :variables, :path, :cache
def initialize(config, path = nil) def initialize(config, path = nil)
@config = YAML.safe_load(config, [Symbol], [], true) @config = YAML.safe_load(config, [Symbol], [], true)
...@@ -44,7 +44,7 @@ module Ci ...@@ -44,7 +44,7 @@ module Ci
def initial_parsing def initial_parsing
@before_script = @config[:before_script] || [] @before_script = @config[:before_script] || []
@finally_script = @config[:finally_script] @after_script = @config[:after_script]
@image = @config[:image] @image = @config[:image]
@services = @config[:services] @services = @config[:services]
@stages = @config[:stages] || @config[:types] @stages = @config[:stages] || @config[:types]
...@@ -86,7 +86,7 @@ module Ci ...@@ -86,7 +86,7 @@ module Ci
artifacts: job[:artifacts], artifacts: job[:artifacts],
cache: job[:cache] || @cache, cache: job[:cache] || @cache,
dependencies: job[:dependencies], dependencies: job[:dependencies],
finally_script: @finally_script, after_script: @after_script,
}.compact }.compact
} }
end end
...@@ -104,8 +104,8 @@ module Ci ...@@ -104,8 +104,8 @@ module Ci
raise ValidationError, "before_script should be an array of strings" raise ValidationError, "before_script should be an array of strings"
end end
unless @finally_script.nil? || validate_array_of_strings(@finally_script) unless @after_script.nil? || validate_array_of_strings(@after_script)
raise ValidationError, "finally_script should be an array of strings" raise ValidationError, "after_script should be an array of strings"
end end
unless @image.nil? || @image.is_a?(String) unless @image.nil? || @image.is_a?(String)
......
...@@ -293,17 +293,17 @@ module Ci ...@@ -293,17 +293,17 @@ module Ci
subject { config_processor.builds_for_stage_and_ref("test", "master").first } subject { config_processor.builds_for_stage_and_ref("test", "master").first }
describe "finally_script" do describe "after_script" do
context "in global context" do context "in global context" do
let(:config) { let(:config) {
{ {
finally_script: ["finally_script"], after_script: ["after_script"],
test: { script: ["script"] } test: { script: ["script"] }
} }
} }
it "return finally_script in options" do it "return after_script in options" do
expect(subject[:options][:finally_script]).to eq(["finally_script"]) expect(subject[:options][:after_script]).to eq(["after_script"])
end end
end end
end end
...@@ -629,11 +629,11 @@ EOT ...@@ -629,11 +629,11 @@ EOT
end.to raise_error(GitlabCiYamlProcessor::ValidationError, "before_script should be an array of strings") end.to raise_error(GitlabCiYamlProcessor::ValidationError, "before_script should be an array of strings")
end end
it "returns errors if finally_script parameter is invalid" do it "returns errors if after_script parameter is invalid" do
config = YAML.dump({ finally_script: "bundle update", rspec: { script: "test" } }) config = YAML.dump({ after_script: "bundle update", rspec: { script: "test" } })
expect do expect do
GitlabCiYamlProcessor.new(config, path) GitlabCiYamlProcessor.new(config, path)
end.to raise_error(GitlabCiYamlProcessor::ValidationError, "finally_script should be an array of strings") end.to raise_error(GitlabCiYamlProcessor::ValidationError, "after_script should be an array of strings")
end end
it "returns errors if image parameter is invalid" do it "returns errors if image parameter is invalid" do
......
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