Commit fe34b745 authored by Kamil Trzcinski's avatar Kamil Trzcinski

Fix tests

parent 1056c9d2
...@@ -123,18 +123,16 @@ module Ci ...@@ -123,18 +123,16 @@ module Ci
config = YAML.dump({ config = YAML.dump({
before_script: ["pwd"], before_script: ["pwd"],
build: { script: "build", type: "build", only: ["master", "deploy"] }, rspec: { script: "rspec", type: "test", only: ["master", "deploy"] },
rspec: { script: "rspec", type: type, only: ["master", "deploy"] },
staging: { script: "deploy", type: "deploy", only: ["master", "deploy"] }, staging: { script: "deploy", type: "deploy", only: ["master", "deploy"] },
production: { script: "deploy", type: "deploy", only: ["master", "deploy"] },
production: { script: "deploy", type: "deploy", only: ["master@path", "deploy"] }, production: { script: "deploy", type: "deploy", only: ["master@path", "deploy"] },
}) })
config_processor = GitlabCiYamlProcessor.new(config, path) config_processor = GitlabCiYamlProcessor.new(config, 'fork')
expect(config_processor.builds_for_stage_and_ref("production", "deploy").size).to eq(0)
expect(config_processor.builds_for_stage_and_ref(type, "deploy").size).to eq(1)
expect(config_processor.builds_for_stage_and_ref("deploy", "deploy").size).to eq(2) expect(config_processor.builds_for_stage_and_ref("deploy", "deploy").size).to eq(2)
expect(config_processor.builds_for_stage_and_ref("test", "deploy").size).to eq(1)
expect(config_processor.builds_for_stage_and_ref("deploy", "master").size).to eq(1)
end end
end end
...@@ -230,18 +228,16 @@ module Ci ...@@ -230,18 +228,16 @@ module Ci
it "returns build except specified type" do it "returns build except specified type" do
config = YAML.dump({ config = YAML.dump({
before_script: ["pwd"], before_script: ["pwd"],
build: { script: "build", type: "build", except: ["master", "deploy"] }, rspec: { script: "rspec", type: "test", except: ["master", "deploy", "test@fork"] },
rspec: { script: "rspec", type: type, except: ["master", "deploy", "test@fork"] }, staging: { script: "deploy", type: "deploy", except: ["master"] },
staging: { script: "deploy", type: "deploy", except: ["master", "deploy"] }, production: { script: "deploy", type: "deploy", except: ["master@fork"] },
production: { script: "deploy", type: "deploy", except: ["master", "deploy"] },
production: { script: "deploy", type: "deploy", except: ["master@path", "deploy"] },
}) })
config_processor = GitlabCiYamlProcessor.new(config, path) config_processor = GitlabCiYamlProcessor.new(config, 'fork')
expect(config_processor.builds_for_stage_and_ref("production", "deploy").size).to eq(0) expect(config_processor.builds_for_stage_and_ref("deploy", "deploy").size).to eq(2)
expect(config_processor.builds_for_stage_and_ref(type, "test").size).to eq(1) expect(config_processor.builds_for_stage_and_ref("test", "test").size).to eq(0)
expect(config_processor.builds_for_stage_and_ref("deploy", "master").size).to eq(2) expect(config_processor.builds_for_stage_and_ref("deploy", "master").size).to eq(0)
end end
end end
......
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