Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
9a1b174d
Commit
9a1b174d
authored
Apr 22, 2016
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some typos
parent
a2e29896
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
lib/ci/gitlab_ci_yaml_processor.rb
lib/ci/gitlab_ci_yaml_processor.rb
+1
-1
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+6
-6
No files found.
lib/ci/gitlab_ci_yaml_processor.rb
View file @
9a1b174d
...
@@ -64,7 +64,7 @@ module Ci
...
@@ -64,7 +64,7 @@ module Ci
@jobs
=
{}
@jobs
=
{}
@config
.
except!
(
*
ALLOWED_YAML_KEYS
)
@config
.
except!
(
*
ALLOWED_YAML_KEYS
)
@config
.
each
{
|
name
,
param
|
add_job
(
name
,
param
)
}
@config
.
each
{
|
name
,
param
|
add_job
(
name
,
param
)
}
raise
ValidationError
,
"Please define at least one job"
if
@jobs
.
none?
raise
ValidationError
,
"Please define at least one job"
if
@jobs
.
none?
end
end
...
...
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
View file @
9a1b174d
...
@@ -652,7 +652,7 @@ module Ci
...
@@ -652,7 +652,7 @@ module Ci
subject
{
config_processor
.
builds_for_stage_and_ref
(
"test"
,
"master"
)
}
subject
{
config_processor
.
builds_for_stage_and_ref
(
"test"
,
"master"
)
}
shared_examples
'hidden_job_handling'
do
shared_examples
'hidden_job_handling'
do
it
"doesn't create jobs that start
s
with dot"
do
it
"doesn't create jobs that start with dot"
do
expect
(
subject
.
size
).
to
eq
(
1
)
expect
(
subject
.
size
).
to
eq
(
1
)
expect
(
subject
.
first
).
to
eq
({
expect
(
subject
.
first
).
to
eq
({
except:
nil
,
except:
nil
,
...
@@ -669,7 +669,7 @@ module Ci
...
@@ -669,7 +669,7 @@ module Ci
end
end
end
end
context
'
W
hen hidden job have a script definition'
do
context
'
w
hen hidden job have a script definition'
do
let
(
:config
)
do
let
(
:config
)
do
YAML
.
dump
({
YAML
.
dump
({
'.hidden_job'
=>
{
image:
'ruby:2.1'
,
script:
'test'
},
'.hidden_job'
=>
{
image:
'ruby:2.1'
,
script:
'test'
},
...
@@ -680,7 +680,7 @@ module Ci
...
@@ -680,7 +680,7 @@ module Ci
it_behaves_like
'hidden_job_handling'
it_behaves_like
'hidden_job_handling'
end
end
context
"
W
hen hidden job doesn't have a script definition"
do
context
"
w
hen hidden job doesn't have a script definition"
do
let
(
:config
)
do
let
(
:config
)
do
YAML
.
dump
({
YAML
.
dump
({
'.hidden_job'
=>
{
image:
'ruby:2.1'
},
'.hidden_job'
=>
{
image:
'ruby:2.1'
},
...
@@ -726,7 +726,7 @@ module Ci
...
@@ -726,7 +726,7 @@ module Ci
end
end
end
end
context
'
W
hen template is a job'
do
context
'
w
hen template is a job'
do
let
(
:config
)
do
let
(
:config
)
do
<<
EOT
<<
EOT
job1: &JOBTMPL
job1: &JOBTMPL
...
@@ -740,7 +740,7 @@ EOT
...
@@ -740,7 +740,7 @@ EOT
it_behaves_like
'job_templates_handling'
it_behaves_like
'job_templates_handling'
end
end
context
'
W
hen template is a hidden job'
do
context
'
w
hen template is a hidden job'
do
let
(
:config
)
do
let
(
:config
)
do
<<
EOT
<<
EOT
.template: &JOBTMPL
.template: &JOBTMPL
...
@@ -756,7 +756,7 @@ EOT
...
@@ -756,7 +756,7 @@ EOT
it_behaves_like
'job_templates_handling'
it_behaves_like
'job_templates_handling'
end
end
context
"When job adds it's own keys to a template definition"
do
context
'when job adds its own keys to a template definition'
do
let
(
:config
)
do
let
(
:config
)
do
<<
EOT
<<
EOT
.template: &JOBTMPL
.template: &JOBTMPL
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment