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
7f6cb5c1
Commit
7f6cb5c1
authored
Jul 15, 2019
by
Jarka Košanová
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix resource event when a label is removed
parent
62bf2d8a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
8 deletions
+16
-8
ee/app/models/ee/label_note.rb
ee/app/models/ee/label_note.rb
+1
-1
ee/spec/models/label_note_spec.rb
ee/spec/models/label_note_spec.rb
+15
-7
No files found.
ee/app/models/ee/label_note.rb
View file @
7f6cb5c1
...
...
@@ -18,7 +18,7 @@ module EE
end
def
scoped_labels_event?
events
.
first
.
label
.
scoped_label?
events
.
first
.
label
&
.
scoped_label?
end
end
end
ee/spec/models/label_note_spec.rb
View file @
7f6cb5c1
...
...
@@ -10,20 +10,28 @@ describe LabelNote do
set
(
:label
)
{
create
(
:group_label
,
group:
group
)
}
set
(
:label2
)
{
create
(
:group_label
,
group:
group
)
}
let
(
:resource_parent
)
{
group
}
set
(
:resource
)
{
create
(
:epic
,
group:
group
)
}
let
(
:project
)
{
nil
}
let
(
:resource_key
)
{
resource
.
class
.
name
.
underscore
.
to_s
}
let
(
:events
)
{
[
create
(
:resource_label_event
,
label:
label
,
resource_key
=>
resource
)]
}
context
'when resource is epic'
do
set
(
:resource
)
{
create
(
:epic
,
group:
group
)
}
let
(
:project
)
{
nil
}
subject
{
described_class
.
from_events
(
events
)
}
context
'when resource is epic'
do
it_behaves_like
'label note created from events'
it
'includes a link to the list of epics filtered by the label'
do
resource_key
=
resource
.
class
.
name
.
underscore
.
to_s
events
=
[
build
(
:resource_label_event
,
label:
label
,
resource_key
=>
resource
)]
expect
(
subject
.
note_html
).
to
include
(
group_epics_path
(
group
,
label_name:
label
.
title
))
end
end
note
=
described_class
.
from_events
(
events
)
context
'when a label is removed'
do
it
'returns note correctly'
do
events
label
.
destroy
events
.
first
.
reload
expect
(
note
.
note_html
).
to
include
(
group_epics_path
(
group
,
label_name:
label
.
title
)
)
expect
(
subject
.
note
).
to
include
(
'deleted label'
)
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