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
3b364513
Commit
3b364513
authored
May 29, 2018
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix update_prioritization_spec
parent
35b5c830
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
12 deletions
+11
-12
app/views/shared/_label.html.haml
app/views/shared/_label.html.haml
+7
-8
spec/features/projects/labels/update_prioritization_spec.rb
spec/features/projects/labels/update_prioritization_spec.rb
+4
-4
No files found.
app/views/shared/_label.html.haml
View file @
3b364513
...
@@ -14,8 +14,7 @@
...
@@ -14,8 +14,7 @@
-
if
controller
.
is_a?
(
Projects
::
LabelsController
)
-
if
controller
.
is_a?
(
Projects
::
LabelsController
)
%li
.inline
%li
.inline
.label-badge.label-badge-gray
=
label
.
model_name
.
human
.
capitalize
.label-badge.label-badge-gray
=
label
.
model_name
.
human
.
capitalize
-
if
can?
(
current_user
,
:admin_label
,
label
)
-
if
can?
(
current_user
,
:admin_label
,
@project
)
-
if
@project
.
present?
%li
.inline.js-toggle-priority
{
data:
{
url:
remove_priority_project_label_path
(
@project
,
label
),
%li
.inline.js-toggle-priority
{
data:
{
url:
remove_priority_project_label_path
(
@project
,
label
),
dom_id:
dom_id
(
label
),
type:
label
.
type
}
}
dom_id:
dom_id
(
label
),
type:
label
.
type
}
}
%button
.label-action.add-priority.btn.btn-transparent.has-tooltip
{
title:
_
(
'Prioritize'
),
type:
'button'
,
:'data-placement'
=>
'top'
}
%button
.label-action.add-priority.btn.btn-transparent.has-tooltip
{
title:
_
(
'Prioritize'
),
type:
'button'
,
:'data-placement'
=>
'top'
}
...
...
spec/features/projects/labels/update_prioritization_spec.rb
View file @
3b364513
...
@@ -102,16 +102,16 @@ feature 'Prioritize labels' do
...
@@ -102,16 +102,16 @@ feature 'Prioritize labels' do
drag_to
(
selector:
'.label-list-item'
,
from_index:
1
,
to_index:
2
)
drag_to
(
selector:
'.label-list-item'
,
from_index:
1
,
to_index:
2
)
page
.
within
(
'.prioritized-labels'
)
do
page
.
within
(
'.prioritized-labels'
)
do
expect
(
first
(
'
li
'
)).
to
have_content
(
'feature'
)
expect
(
first
(
'
.label-list-item
'
)).
to
have_content
(
'feature'
)
expect
(
page
.
all
(
'
li
'
).
last
).
to
have_content
(
'bug'
)
expect
(
page
.
all
(
'
.label-list-item
'
).
last
).
to
have_content
(
'bug'
)
end
end
refresh
refresh
wait_for_requests
wait_for_requests
page
.
within
(
'.prioritized-labels'
)
do
page
.
within
(
'.prioritized-labels'
)
do
expect
(
first
(
'
li
'
)).
to
have_content
(
'feature'
)
expect
(
first
(
'
.label-list-item
'
)).
to
have_content
(
'feature'
)
expect
(
page
.
all
(
'
li
'
).
last
).
to
have_content
(
'bug'
)
expect
(
page
.
all
(
'
.label-list-item
'
).
last
).
to
have_content
(
'bug'
)
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