summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-06-03 11:39:40 +0300
committerValery Sizov <vsv2711@gmail.com>2015-06-03 16:36:55 +0300
commit1ef2d47ac91d11d6536e3018483cd6d2c0dba6b8 (patch)
treea10677dbc627d35bb9276afac10bf586b8e10cdf
parenta17f79ed832113a42838f2c663d43ea1feba9f45 (diff)
downloadgitlab-ci-1ef2d47ac91d11d6536e3018483cd6d2c0dba6b8.tar.gz
fix specs
-rw-r--r--lib/gitlab_ci_yaml_processor.rb2
-rw-r--r--spec/lib/gitlab_ci_yaml_processor_spec.rb9
-rw-r--r--spec/support/gitlab_stubs/gitlab_ci.yml2
3 files changed, 8 insertions, 5 deletions
diff --git a/lib/gitlab_ci_yaml_processor.rb b/lib/gitlab_ci_yaml_processor.rb
index 0d893df..3368232 100644
--- a/lib/gitlab_ci_yaml_processor.rb
+++ b/lib/gitlab_ci_yaml_processor.rb
@@ -84,7 +84,7 @@ class GitlabCiYamlProcessor
def normalized_deploy_jobs
@deploy_jobs.map do |job|
if job.is_a?(String)
- { script: job, refs: [], name: job[0..10].strip }
+ { script: job, runner: "", refs: [], name: job[0..10].strip }
else
{
script: normalized_script(job[:script]),
diff --git a/spec/lib/gitlab_ci_yaml_processor_spec.rb b/spec/lib/gitlab_ci_yaml_processor_spec.rb
index 6007e9d..2ce140c 100644
--- a/spec/lib/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/gitlab_ci_yaml_processor_spec.rb
@@ -68,7 +68,8 @@ describe GitlabCiYamlProcessor do
commands: "\nls",
name: "ls",
deploy: true,
- refs: []
+ refs: [],
+ tag_list: ""
}
end
@@ -84,7 +85,8 @@ describe GitlabCiYamlProcessor do
commands: "pwd\nls",
name: "ls",
deploy: true,
- refs: []
+ refs: [],
+ tag_list: ""
}
end
@@ -100,7 +102,8 @@ describe GitlabCiYamlProcessor do
commands: "pwd\nls",
name: "Rspec",
deploy: true,
- refs: ["master", "deploy"]
+ refs: ["master", "deploy"],
+ tag_list: ""
}
end
end
diff --git a/spec/support/gitlab_stubs/gitlab_ci.yml b/spec/support/gitlab_stubs/gitlab_ci.yml
index 3ad21d4..4f76e36 100644
--- a/spec/support/gitlab_stubs/gitlab_ci.yml
+++ b/spec/support/gitlab_stubs/gitlab_ci.yml
@@ -14,7 +14,7 @@ jobs:
runner: "ruby,mysql"
name: "Spinach"
tags: true
- branches: false
+ branches: true
# Parallel deploy jobs
deploy_jobs: