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
Tatuya Kamada
gitlab-ce
Commits
0ff89759
Commit
0ff89759
authored
Oct 14, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix cancel_all specs
parent
d9ece71e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/projects/builds/index.html.haml
app/views/projects/builds/index.html.haml
+1
-1
config/routes.rb
config/routes.rb
+1
-1
spec/features/builds_spec.rb
spec/features/builds_spec.rb
+2
-2
No files found.
app/views/projects/builds/index.html.haml
View file @
0ff89759
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
-
if
@ci_project
&&
current_user
&&
can?
(
current_user
,
:manage_builds
,
@project
)
-
if
@ci_project
&&
current_user
&&
can?
(
current_user
,
:manage_builds
,
@project
)
.pull-left.hidden-xs
.pull-left.hidden-xs
-
if
@all_builds
.
running_or_pending
.
any?
-
if
@all_builds
.
running_or_pending
.
any?
=
link_to
'Cancel all'
,
cancel_all_namespace_project_builds_path
(
@project
.
namespace
,
@project
),
data:
{
confirm:
'Are you sure?'
},
method: :post
,
class:
'btn btn-danger'
=
link_to
'Cancel all'
,
cancel_all_namespace_project_builds_path
(
@project
.
namespace
,
@project
),
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-danger'
%ul
.center-top-menu
%ul
.center-top-menu
%li
{
class:
(
'active'
if
@scope
.
nil?
)}
%li
{
class:
(
'active'
if
@scope
.
nil?
)}
...
...
config/routes.rb
View file @
0ff89759
...
@@ -587,7 +587,7 @@ Gitlab::Application.routes.draw do
...
@@ -587,7 +587,7 @@ Gitlab::Application.routes.draw do
resources
:builds
,
only:
[
:index
,
:show
]
do
resources
:builds
,
only:
[
:index
,
:show
]
do
collection
do
collection
do
pos
t
:cancel_all
ge
t
:cancel_all
end
end
member
do
member
do
...
...
spec/features/builds_spec.rb
View file @
0ff89759
...
@@ -47,10 +47,10 @@ describe "Builds" do
...
@@ -47,10 +47,10 @@ describe "Builds" do
end
end
end
end
describe
"
POS
T /:project/builds/:id/cancel_all"
do
describe
"
GE
T /:project/builds/:id/cancel_all"
do
before
do
before
do
@build
.
run!
@build
.
run!
visit
cancel_
namespace_project_build_path
(
@gl_project
.
namespace
,
@gl_project
,
@build
)
visit
cancel_
all_namespace_project_builds_path
(
@gl_project
.
namespace
,
@gl_project
)
end
end
it
{
expect
(
page
).
to
have_content
'All'
}
it
{
expect
(
page
).
to
have_content
'All'
}
...
...
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