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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
4c1262ff
Commit
4c1262ff
authored
Apr 01, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
7a61ecc0
63cd518f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
5 deletions
+37
-5
GITALY_SERVER_VERSION
GITALY_SERVER_VERSION
+1
-1
lib/gitlab/gitaly_client.rb
lib/gitlab/gitaly_client.rb
+1
-1
spec/features/projects/pipelines/pipeline_spec.rb
spec/features/projects/pipelines/pipeline_spec.rb
+35
-3
No files found.
GITALY_SERVER_VERSION
View file @
4c1262ff
1.
29
.0
1.
30
.0
lib/gitlab/gitaly_client.rb
View file @
4c1262ff
...
...
@@ -232,7 +232,7 @@ module Gitlab
result
end
SERVER_FEATURE_FLAGS
=
%w[
go-find-all-tags
]
.
freeze
SERVER_FEATURE_FLAGS
=
%w[]
.
freeze
def
self
.
server_feature_flags
SERVER_FEATURE_FLAGS
.
map
do
|
f
|
...
...
spec/features/projects/pipelines/pipeline_spec.rb
View file @
4c1262ff
...
...
@@ -59,11 +59,11 @@ describe 'Pipeline', :js do
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
,
ref:
'master'
,
sha:
project
.
commit
.
id
,
user:
user
)
}
before
do
visit
project_pipeline_path
(
project
,
pipeline
)
end
subject
(
:visit_pipeline
)
{
visit
project_pipeline_path
(
project
,
pipeline
)
}
it
'shows the pipeline graph'
do
visit_pipeline
expect
(
page
).
to
have_selector
(
'.pipeline-visualization'
)
expect
(
page
).
to
have_content
(
'Build'
)
expect
(
page
).
to
have_content
(
'Test'
)
...
...
@@ -73,14 +73,20 @@ describe 'Pipeline', :js do
end
it
'shows Pipeline tab pane as active'
do
visit_pipeline
expect
(
page
).
to
have_css
(
'#js-tab-pipeline.active'
)
end
it
'shows link to the pipeline ref'
do
visit_pipeline
expect
(
page
).
to
have_link
(
pipeline
.
ref
)
end
it
'shows the pipeline information'
do
visit_pipeline
within
'.pipeline-info'
do
expect
(
page
).
to
have_content
(
"
#{
pipeline
.
statuses
.
count
}
jobs "
\
"for
#{
pipeline
.
ref
}
"
)
...
...
@@ -96,6 +102,10 @@ describe 'Pipeline', :js do
end
describe
'pipeline graph'
do
before
do
visit_pipeline
end
context
'when pipeline has running builds'
do
it
'shows a running icon and a cancel action for the running build'
do
page
.
within
(
'#ci-badge-deploy'
)
do
...
...
@@ -227,6 +237,10 @@ describe 'Pipeline', :js do
end
context
'page tabs'
do
before
do
visit_pipeline
end
it
'shows Pipeline, Jobs and Failed Jobs tabs with link'
do
expect
(
page
).
to
have_link
(
'Pipeline'
)
expect
(
page
).
to
have_link
(
'Jobs'
)
...
...
@@ -253,6 +267,10 @@ describe 'Pipeline', :js do
end
context
'retrying jobs'
do
before
do
visit_pipeline
end
it
{
expect
(
page
).
not_to
have_content
(
'retried'
)
}
context
'when retrying'
do
...
...
@@ -265,6 +283,10 @@ describe 'Pipeline', :js do
end
context
'canceling jobs'
do
before
do
visit_pipeline
end
it
{
expect
(
page
).
not_to
have_selector
(
'.ci-canceled'
)
}
context
'when canceling'
do
...
...
@@ -284,6 +306,10 @@ describe 'Pipeline', :js do
user:
user
)
end
before
do
visit_pipeline
end
it
'does not render link to the pipeline ref'
do
expect
(
page
).
not_to
have_link
(
pipeline
.
ref
)
expect
(
page
).
to
have_content
(
pipeline
.
ref
)
...
...
@@ -305,6 +331,10 @@ describe 'Pipeline', :js do
merge_request
.
all_pipelines
.
last
end
before
do
visit_pipeline
end
it
'shows the pipeline information'
do
within
'.pipeline-info'
do
expect
(
page
).
to
have_content
(
"
#{
pipeline
.
statuses
.
count
}
jobs "
\
...
...
@@ -356,6 +386,8 @@ describe 'Pipeline', :js do
before
do
pipeline
.
update
(
user:
user
)
visit_pipeline
end
it
'shows the pipeline information'
do
...
...
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