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
Léo-Paul Géneau
gitlab-ce
Commits
8b14e164
Commit
8b14e164
authored
Feb 21, 2017
by
dimitrieh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix more tests
parent
b86640fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/views/projects/commit/_pipeline.html.haml
app/views/projects/commit/_pipeline.html.haml
+1
-1
spec/features/projects/pipelines/pipeline_spec.rb
spec/features/projects/pipelines/pipeline_spec.rb
+2
-2
No files found.
app/views/projects/commit/_pipeline.html.haml
View file @
8b14e164
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
.pull-right
.pull-right
-
if
can?
(
current_user
,
:update_pipeline
,
pipeline
.
project
)
-
if
can?
(
current_user
,
:update_pipeline
,
pipeline
.
project
)
-
if
pipeline
.
builds
.
latest
.
failed
.
any?
(
&
:retryable?
)
-
if
pipeline
.
builds
.
latest
.
failed
.
any?
(
&
:retryable?
)
=
link_to
"Retry"
,
retry_namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
),
class:
'btn btn-grouped btn-primary'
,
method: :post
=
link_to
"Retry"
,
retry_namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
),
class:
'
js-retry-button
btn btn-grouped btn-primary'
,
method: :post
-
if
pipeline
.
builds
.
running_or_pending
.
any?
-
if
pipeline
.
builds
.
running_or_pending
.
any?
=
link_to
"Cancel running"
,
cancel_namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
),
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-grouped btn-danger'
,
method: :post
=
link_to
"Cancel running"
,
cancel_namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
),
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-grouped btn-danger'
,
method: :post
...
...
spec/features/projects/pipelines/pipeline_spec.rb
View file @
8b14e164
...
@@ -164,7 +164,7 @@ describe 'Pipeline', :feature, :js do
...
@@ -164,7 +164,7 @@ describe 'Pipeline', :feature, :js do
it
{
expect
(
page
).
not_to
have_content
(
'retried'
)
}
it
{
expect
(
page
).
not_to
have_content
(
'retried'
)
}
context
'when retrying'
do
context
'when retrying'
do
before
{
click_
on
'Retry'
}
before
{
click_
link
(
'Retry'
,
class:
'js-retry-button'
)
}
it
{
expect
(
page
).
not_to
have_content
(
'Retry'
)
}
it
{
expect
(
page
).
not_to
have_content
(
'Retry'
)
}
end
end
...
@@ -226,7 +226,7 @@ describe 'Pipeline', :feature, :js do
...
@@ -226,7 +226,7 @@ describe 'Pipeline', :feature, :js do
it
{
expect
(
page
).
not_to
have_content
(
'retried'
)
}
it
{
expect
(
page
).
not_to
have_content
(
'retried'
)
}
context
'when retrying'
do
context
'when retrying'
do
before
{
click_
on
'Retry'
}
before
{
click_
link
(
'Retry'
,
class:
'js-retry-button'
)
}
it
{
expect
(
page
).
not_to
have_content
(
'Retry'
)
}
it
{
expect
(
page
).
not_to
have_content
(
'Retry'
)
}
it
{
expect
(
page
).
to
have_selector
(
'.retried'
)
}
it
{
expect
(
page
).
to
have_selector
(
'.retried'
)
}
...
...
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