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
0cba9bef
Commit
0cba9bef
authored
Jan 14, 2019
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs related to emtpy `except` policy config
parent
0ea8c236
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
10 deletions
+5
-10
spec/lib/gitlab/ci/config/entry/global_spec.rb
spec/lib/gitlab/ci/config/entry/global_spec.rb
+2
-4
spec/lib/gitlab/ci/config/entry/job_spec.rb
spec/lib/gitlab/ci/config/entry/job_spec.rb
+1
-2
spec/lib/gitlab/ci/config/entry/jobs_spec.rb
spec/lib/gitlab/ci/config/entry/jobs_spec.rb
+2
-4
No files found.
spec/lib/gitlab/ci/config/entry/global_spec.rb
View file @
0cba9bef
...
@@ -160,8 +160,7 @@ describe Gitlab::Ci::Config::Entry::Global do
...
@@ -160,8 +160,7 @@ describe Gitlab::Ci::Config::Entry::Global do
variables:
{
'VAR'
=>
'value'
},
variables:
{
'VAR'
=>
'value'
},
ignore:
false
,
ignore:
false
,
after_script:
[
'make clean'
],
after_script:
[
'make clean'
],
only:
{
refs:
%w[branches tags]
},
only:
{
refs:
%w[branches tags]
}
},
except:
{}
},
spinach:
{
name: :spinach
,
spinach:
{
name: :spinach
,
before_script:
[],
before_script:
[],
script:
%w[spinach]
,
script:
%w[spinach]
,
...
@@ -172,8 +171,7 @@ describe Gitlab::Ci::Config::Entry::Global do
...
@@ -172,8 +171,7 @@ describe Gitlab::Ci::Config::Entry::Global do
variables:
{},
variables:
{},
ignore:
false
,
ignore:
false
,
after_script:
[
'make clean'
],
after_script:
[
'make clean'
],
only:
{
refs:
%w[branches tags]
},
only:
{
refs:
%w[branches tags]
}
}
except:
{}
}
)
)
end
end
end
end
...
...
spec/lib/gitlab/ci/config/entry/job_spec.rb
View file @
0cba9bef
...
@@ -258,8 +258,7 @@ describe Gitlab::Ci::Config::Entry::Job do
...
@@ -258,8 +258,7 @@ describe Gitlab::Ci::Config::Entry::Job do
stage:
'test'
,
stage:
'test'
,
ignore:
false
,
ignore:
false
,
after_script:
%w[cleanup]
,
after_script:
%w[cleanup]
,
only:
{
refs:
%w[branches tags]
},
only:
{
refs:
%w[branches tags]
})
except:
{})
end
end
end
end
end
end
...
...
spec/lib/gitlab/ci/config/entry/jobs_spec.rb
View file @
0cba9bef
...
@@ -67,14 +67,12 @@ describe Gitlab::Ci::Config::Entry::Jobs do
...
@@ -67,14 +67,12 @@ describe Gitlab::Ci::Config::Entry::Jobs do
script:
%w[rspec]
,
script:
%w[rspec]
,
ignore:
false
,
ignore:
false
,
stage:
'test'
,
stage:
'test'
,
only:
{
refs:
%w[branches tags]
},
only:
{
refs:
%w[branches tags]
}
},
except:
{}
},
spinach:
{
name: :spinach
,
spinach:
{
name: :spinach
,
script:
%w[spinach]
,
script:
%w[spinach]
,
ignore:
false
,
ignore:
false
,
stage:
'test'
,
stage:
'test'
,
only:
{
refs:
%w[branches tags]
},
only:
{
refs:
%w[branches tags]
}
})
except:
{}
})
end
end
end
end
...
...
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