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
5eca31cb
Commit
5eca31cb
authored
May 06, 2021
by
Jonas Wälter
Committed by
Heinrich Lee Yu
May 06, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Milestone description: add autocomplete [RUN AS-IF-FOSS]
parent
023929fc
Changes
28
Show whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
568 additions
and
206 deletions
+568
-206
.rubocop_manual_todo.yml
.rubocop_manual_todo.yml
+2
-2
app/assets/javascripts/pages/groups/milestones/edit/index.js
app/assets/javascripts/pages/groups/milestones/edit/index.js
+1
-1
app/assets/javascripts/pages/groups/milestones/new/index.js
app/assets/javascripts/pages/groups/milestones/new/index.js
+1
-1
app/controllers/groups/autocomplete_sources_controller.rb
app/controllers/groups/autocomplete_sources_controller.rb
+54
-0
app/controllers/groups/milestones_controller.rb
app/controllers/groups/milestones_controller.rb
+2
-2
app/controllers/projects/milestones_controller.rb
app/controllers/projects/milestones_controller.rb
+2
-2
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+20
-9
app/serializers/group_issuable_autocomplete_entity.rb
app/serializers/group_issuable_autocomplete_entity.rb
+0
-0
app/serializers/group_issuable_autocomplete_serializer.rb
app/serializers/group_issuable_autocomplete_serializer.rb
+0
-0
app/services/groups/autocomplete_service.rb
app/services/groups/autocomplete_service.rb
+2
-18
app/services/groups/participants_service.rb
app/services/groups/participants_service.rb
+0
-0
app/views/groups/milestones/_form.html.haml
app/views/groups/milestones/_form.html.haml
+5
-1
app/views/projects/milestones/_form.html.haml
app/views/projects/milestones/_form.html.haml
+5
-1
changelogs/unreleased/feat-milestone-description-auto-complete.yml
...s/unreleased/feat-milestone-description-auto-complete.yml
+5
-0
config/routes/group.rb
config/routes/group.rb
+11
-0
ee/app/controllers/ee/groups/autocomplete_sources_controller.rb
.../controllers/ee/groups/autocomplete_sources_controller.rb
+31
-0
ee/app/helpers/ee/application_helper.rb
ee/app/helpers/ee/application_helper.rb
+2
-8
ee/app/services/ee/groups/autocomplete_service.rb
ee/app/services/ee/groups/autocomplete_service.rb
+24
-0
ee/config/routes/group.rb
ee/config/routes/group.rb
+0
-6
ee/spec/controllers/ee/groups/autocomplete_sources_controller_spec.rb
...rollers/ee/groups/autocomplete_sources_controller_spec.rb
+29
-55
ee/spec/services/ee/groups/autocomplete_service_spec.rb
ee/spec/services/ee/groups/autocomplete_service_spec.rb
+0
-91
spec/controllers/groups/autocomplete_sources_controller_spec.rb
...ontrollers/groups/autocomplete_sources_controller_spec.rb
+69
-0
spec/features/groups/milestone_spec.rb
spec/features/groups/milestone_spec.rb
+2
-2
spec/features/groups/milestones/gfm_autocomplete_spec.rb
spec/features/groups/milestones/gfm_autocomplete_spec.rb
+80
-0
spec/features/projects/milestones/gfm_autocomplete_spec.rb
spec/features/projects/milestones/gfm_autocomplete_spec.rb
+80
-0
spec/helpers/application_helper_spec.rb
spec/helpers/application_helper_spec.rb
+22
-7
spec/serializers/group_issuable_autocomplete_entity_spec.rb
spec/serializers/group_issuable_autocomplete_entity_spec.rb
+0
-0
spec/services/groups/autocomplete_service_spec.rb
spec/services/groups/autocomplete_service_spec.rb
+119
-0
No files found.
.rubocop_manual_todo.yml
View file @
5eca31cb
...
...
@@ -1999,6 +1999,8 @@ Gitlab/NamespacedClass:
-
'
app/serializers/group_entity.rb'
-
'
app/serializers/group_group_link_entity.rb'
-
'
app/serializers/group_group_link_serializer.rb'
-
'
app/serializers/group_issuable_autocomplete_entity.rb'
-
'
app/serializers/group_issuable_autocomplete_serializer.rb'
-
'
app/serializers/group_serializer.rb'
-
'
app/serializers/issuable_entity.rb'
-
'
app/serializers/issuable_sidebar_basic_entity.rb'
...
...
@@ -2501,8 +2503,6 @@ Gitlab/NamespacedClass:
-
'
ee/app/serializers/geo_project_registry_entity.rb'
-
'
ee/app/serializers/geo_project_registry_serializer.rb'
-
'
ee/app/serializers/group_analytics_serializer.rb'
-
'
ee/app/serializers/group_issuable_autocomplete_entity.rb'
-
'
ee/app/serializers/group_issuable_autocomplete_serializer.rb'
-
'
ee/app/serializers/group_vulnerability_autocomplete_entity.rb'
-
'
ee/app/serializers/group_vulnerability_autocomplete_serializer.rb'
-
'
ee/app/serializers/invited_group_entity.rb'
...
...
app/assets/javascripts/pages/groups/milestones/edit/index.js
View file @
5eca31cb
import
initForm
from
'
../../../../shared/milestones/form
'
;
initForm
(
false
);
initForm
();
app/assets/javascripts/pages/groups/milestones/new/index.js
View file @
5eca31cb
import
initForm
from
'
../../../../shared/milestones/form
'
;
initForm
(
false
);
initForm
();
ee/
app/controllers/groups/autocomplete_sources_controller.rb
→
app/controllers/groups/autocomplete_sources_controller.rb
View file @
5eca31cb
# frozen_string_literal: true
class
Groups::AutocompleteSourcesController
<
Groups
::
ApplicationController
before_action
:load_autocomplete_service
,
except:
[
:members
]
feature_category
:subgroups
,
[
:members
]
feature_category
:issue_tracking
,
[
:issues
,
:labels
,
:milestones
,
:commands
]
feature_category
:code_review
,
[
:merge_requests
]
feature_category
:epics
,
[
:epics
]
feature_category
:vulnerability_management
,
[
:vulnerabilities
]
def
members
render
json:
::
Groups
::
ParticipantsService
.
new
(
@group
,
current_user
).
execute
(
target
)
...
...
@@ -15,52 +11,37 @@ class Groups::AutocompleteSourcesController < Groups::ApplicationController
def
issues
render
json:
issuable_serializer
.
represent
(
@
autocomplete_service
.
issues
(
confidential_only:
params
[
:confidential_only
],
issue_types:
params
[
:issue_types
]),
autocomplete_service
.
issues
(
confidential_only:
params
[
:confidential_only
],
issue_types:
params
[
:issue_types
]),
parent_group:
@group
)
end
def
merge_requests
render
json:
issuable_serializer
.
represent
(
@
autocomplete_service
.
merge_requests
,
parent_group:
@group
)
render
json:
issuable_serializer
.
represent
(
autocomplete_service
.
merge_requests
,
parent_group:
@group
)
end
def
labels
render
json:
@autocomplete_service
.
labels_as_hash
(
target
)
end
def
epics
render
json:
issuable_serializer
.
represent
(
@autocomplete_service
.
epics
(
confidential_only:
params
[
:confidential_only
]),
parent_group:
@group
)
end
def
vulnerabilities
render
json:
vulnerability_serializer
.
represent
(
@autocomplete_service
.
vulnerabilities
,
parent_group:
@group
)
render
json:
autocomplete_service
.
labels_as_hash
(
target
)
end
def
commands
render
json:
@
autocomplete_service
.
commands
(
target
)
render
json:
autocomplete_service
.
commands
(
target
)
end
def
milestones
render
json:
@
autocomplete_service
.
milestones
render
json:
autocomplete_service
.
milestones
end
private
def
load_
autocomplete_service
@autocomplete_service
=
::
Groups
::
AutocompleteService
.
new
(
@group
,
current_user
,
params
)
def
autocomplete_service
@autocomplete_service
||
=
::
Groups
::
AutocompleteService
.
new
(
@group
,
current_user
,
params
)
end
def
issuable_serializer
GroupIssuableAutocompleteSerializer
.
new
end
def
vulnerability_serializer
GroupVulnerabilityAutocompleteSerializer
.
new
end
# rubocop: disable CodeReuse/ActiveRecord
def
target
QuickActions
::
TargetService
...
...
@@ -69,3 +50,5 @@ class Groups::AutocompleteSourcesController < Groups::ApplicationController
end
# rubocop: enable CodeReuse/ActiveRecord
end
Groups
::
AutocompleteSourcesController
.
prepend_if_ee
(
'EE::Groups::AutocompleteSourcesController'
)
app/controllers/groups/milestones_controller.rb
View file @
5eca31cb
...
...
@@ -21,7 +21,7 @@ class Groups::MilestonesController < Groups::ApplicationController
end
def
new
@milestone
=
Milestone
.
new
@
noteable
=
@
milestone
=
Milestone
.
new
end
def
create
...
...
@@ -70,7 +70,7 @@ class Groups::MilestonesController < Groups::ApplicationController
end
def
milestone
@
milestone
=
group
.
milestones
.
find_by_iid
(
params
[
:id
])
@
noteable
=
@milestone
||
=
group
.
milestones
.
find_by_iid
(
params
[
:id
])
render_404
unless
@milestone
end
...
...
app/controllers/projects/milestones_controller.rb
View file @
5eca31cb
...
...
@@ -39,7 +39,7 @@ class Projects::MilestonesController < Projects::ApplicationController
end
def
new
@milestone
=
@project
.
milestones
.
new
@
noteable
=
@
milestone
=
@project
.
milestones
.
new
respond_with
(
@milestone
)
end
...
...
@@ -125,7 +125,7 @@ class Projects::MilestonesController < Projects::ApplicationController
# rubocop: disable CodeReuse/ActiveRecord
def
milestone
@milestone
||=
@project
.
milestones
.
find_by!
(
iid:
params
[
:id
])
@
noteable
=
@
milestone
||=
@project
.
milestones
.
find_by!
(
iid:
params
[
:id
])
end
# rubocop: enable CodeReuse/ActiveRecord
...
...
app/helpers/application_helper.rb
View file @
5eca31cb
...
...
@@ -382,6 +382,16 @@ module ApplicationHelper
def
autocomplete_data_sources
(
object
,
noteable_type
)
return
{}
unless
object
&&
noteable_type
if
object
.
is_a?
(
Group
)
{
members:
members_group_autocomplete_sources_path
(
object
,
type:
noteable_type
,
type_id:
params
[
:id
]),
issues:
issues_group_autocomplete_sources_path
(
object
),
mergeRequests:
merge_requests_group_autocomplete_sources_path
(
object
),
labels:
labels_group_autocomplete_sources_path
(
object
,
type:
noteable_type
,
type_id:
params
[
:id
]),
milestones:
milestones_group_autocomplete_sources_path
(
object
),
commands:
commands_group_autocomplete_sources_path
(
object
,
type:
noteable_type
,
type_id:
params
[
:id
])
}
else
{
members:
members_project_autocomplete_sources_path
(
object
,
type:
noteable_type
,
type_id:
params
[
:id
]),
issues:
issues_project_autocomplete_sources_path
(
object
),
...
...
@@ -392,6 +402,7 @@ module ApplicationHelper
snippets:
snippets_project_autocomplete_sources_path
(
object
)
}
end
end
def
asset_to_string
(
name
)
app
=
Rails
.
application
...
...
ee/
app/serializers/group_issuable_autocomplete_entity.rb
→
app/serializers/group_issuable_autocomplete_entity.rb
View file @
5eca31cb
File moved
ee/
app/serializers/group_issuable_autocomplete_serializer.rb
→
app/serializers/group_issuable_autocomplete_serializer.rb
View file @
5eca31cb
File moved
ee/
app/services/groups/autocomplete_service.rb
→
app/services/groups/autocomplete_service.rb
View file @
5eca31cb
...
...
@@ -26,24 +26,6 @@ module Groups
end
# rubocop: enable CodeReuse/ActiveRecord
def
epics
(
confidential_only:
false
)
finder_params
=
{
group_id:
group
.
id
}
finder_params
[
:confidential
]
=
true
if
confidential_only
.
present?
# TODO: use include_descendant_groups: true optional parameter once frontend supports epics from external groups.
# See https://gitlab.com/gitlab-org/gitlab/issues/6837
EpicsFinder
.
new
(
current_user
,
finder_params
)
.
execute
.
select
(
:iid
,
:title
,
:group_id
)
end
def
vulnerabilities
::
Autocomplete
::
VulnerabilitiesAutocompleteFinder
.
new
(
current_user
,
group
,
params
)
.
execute
.
select
([
:id
,
:title
,
:project_id
])
end
# rubocop: disable CodeReuse/ActiveRecord
def
milestones
group_ids
=
group
.
self_and_ancestors
.
public_or_visible_to_user
(
current_user
).
pluck
(
:id
)
...
...
@@ -63,3 +45,5 @@ module Groups
end
end
end
Groups
::
AutocompleteService
.
prepend_if_ee
(
'EE::Groups::AutocompleteService'
)
ee/
app/services/groups/participants_service.rb
→
app/services/groups/participants_service.rb
View file @
5eca31cb
File moved
app/views/groups/milestones/_form.html.haml
View file @
5eca31cb
...
...
@@ -12,7 +12,11 @@
=
f
.
label
:description
,
_
(
"Description"
)
.col-sm-10
=
render
layout:
'shared/md_preview'
,
locals:
{
url:
group_preview_markdown_path
}
do
=
render
'shared/zen'
,
f:
f
,
attr: :description
,
classes:
'note-textarea'
,
qa_selector:
'milestone_description_field'
,
placeholder:
_
(
'Write milestone description...'
),
supports_autocomplete:
false
=
render
'shared/zen'
,
f:
f
,
attr: :description
,
classes:
'note-textarea'
,
qa_selector:
'milestone_description_field'
,
supports_autocomplete:
true
,
placeholder:
_
(
'Write milestone description...'
)
.clearfix
.error-alert
=
render
"shared/milestones/form_dates"
,
f:
f
...
...
app/views/projects/milestones/_form.html.haml
View file @
5eca31cb
...
...
@@ -13,7 +13,11 @@
=
f
.
label
:description
,
_
(
'Description'
)
.col-sm-10
=
render
layout:
'shared/md_preview'
,
locals:
{
url:
preview_markdown_path
(
@project
)
}
do
=
render
'shared/zen'
,
f:
f
,
attr: :description
,
classes:
'note-textarea'
,
qa_selector:
'milestone_description_field'
,
placeholder:
_
(
'Write milestone description...'
)
=
render
'shared/zen'
,
f:
f
,
attr: :description
,
classes:
'note-textarea'
,
qa_selector:
'milestone_description_field'
,
supports_autocomplete:
true
,
placeholder:
_
(
'Write milestone description...'
)
=
render
'shared/notes/hints'
.clearfix
.error-alert
...
...
changelogs/unreleased/feat-milestone-description-auto-complete.yml
0 → 100644
View file @
5eca31cb
---
title
:
Add autocomplete to milestone description
merge_request
:
59564
author
:
Jonas Wälter @wwwjon
type
:
added
config/routes/group.rb
View file @
5eca31cb
...
...
@@ -114,6 +114,17 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
resources
:container_registries
,
only:
[
:index
,
:show
],
controller:
'registry/repositories'
resource
:dependency_proxy
,
only:
[
:show
,
:update
]
resources
:email_campaigns
,
only: :index
resources
:autocomplete_sources
,
only:
[]
do
collection
do
get
'members'
get
'issues'
get
'merge_requests'
get
'labels'
get
'commands'
get
'milestones'
end
end
end
scope
(
path:
'*id'
,
...
...
ee/app/controllers/ee/groups/autocomplete_sources_controller.rb
0 → 100644
View file @
5eca31cb
# frozen_string_literal: true
module
EE
module
Groups
module
AutocompleteSourcesController
extend
ActiveSupport
::
Concern
prepended
do
feature_category
:epics
,
[
:epics
]
feature_category
:vulnerability_management
,
[
:vulnerabilities
]
end
def
epics
render
json:
issuable_serializer
.
represent
(
autocomplete_service
.
epics
(
confidential_only:
params
[
:confidential_only
]),
parent_group:
group
)
end
def
vulnerabilities
render
json:
vulnerability_serializer
.
represent
(
autocomplete_service
.
vulnerabilities
,
parent_group:
group
)
end
private
def
vulnerability_serializer
GroupVulnerabilityAutocompleteSerializer
.
new
end
end
end
end
ee/app/helpers/ee/application_helper.rb
View file @
5eca31cb
...
...
@@ -98,15 +98,9 @@ module EE
if
object
.
is_a?
(
Group
)
{
members:
members_group_autocomplete_sources_path
(
object
,
type:
noteable_type
,
type_id:
params
[
:id
]),
labels:
labels_group_autocomplete_sources_path
(
object
,
type:
noteable_type
,
type_id:
params
[
:id
]),
issues:
issues_group_autocomplete_sources_path
(
object
),
mergeRequests:
merge_requests_group_autocomplete_sources_path
(
object
),
epics:
epics_group_autocomplete_sources_path
(
object
),
vulnerabilities:
enabled_for_vulnerabilities
?
vulnerabilities_group_autocomplete_sources_path
(
object
)
:
nil
,
commands:
commands_group_autocomplete_sources_path
(
object
,
type:
noteable_type
,
type_id:
params
[
:id
]),
milestones:
milestones_group_autocomplete_sources_path
(
object
)
}.
compact
vulnerabilities:
enabled_for_vulnerabilities
?
vulnerabilities_group_autocomplete_sources_path
(
object
)
:
nil
}.
compact
.
merge
(
super
)
else
{
epics:
object
.
group
&
.
feature_available?
(
:epics
)
?
epics_project_autocomplete_sources_path
(
object
)
:
nil
,
...
...
ee/app/services/ee/groups/autocomplete_service.rb
0 → 100644
View file @
5eca31cb
# frozen_string_literal: true
module
EE
module
Groups
module
AutocompleteService
def
epics
(
confidential_only:
false
)
finder_params
=
{
group_id:
group
.
id
}
finder_params
[
:confidential
]
=
true
if
confidential_only
.
present?
# TODO: use include_descendant_groups: true optional parameter once frontend supports epics from external groups.
# See https://gitlab.com/gitlab-org/gitlab/issues/6837
EpicsFinder
.
new
(
current_user
,
finder_params
)
.
execute
.
select
(
:iid
,
:title
,
:group_id
)
end
def
vulnerabilities
::
Autocomplete
::
VulnerabilitiesAutocompleteFinder
.
new
(
current_user
,
group
,
params
)
.
execute
.
select
([
:id
,
:title
,
:project_id
])
end
end
end
end
ee/config/routes/group.rb
View file @
5eca31cb
...
...
@@ -90,14 +90,8 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
resources
:autocomplete_sources
,
only:
[]
do
collection
do
get
'members'
get
'issues'
get
'merge_requests'
get
'labels'
get
'epics'
get
'vulnerabilities'
get
'commands'
get
'milestones'
end
end
...
...
ee/spec/controllers/groups/autocomplete_sources_controller_spec.rb
→
ee/spec/controllers/
ee/
groups/autocomplete_sources_controller_spec.rb
View file @
5eca31cb
...
...
@@ -16,6 +16,35 @@ RSpec.describe Groups::AutocompleteSourcesController do
sign_in
(
user
)
end
describe
'#issues'
do
using
RSpec
::
Parameterized
::
TableSyntax
let_it_be
(
:project
)
{
create
(
:project
,
group:
group
)
}
let_it_be
(
:test_case
)
{
create
(
:quality_test_case
,
project:
project
)
}
where
(
:issue_types
,
:expected
)
do
nil
|
:test_case
''
|
:test_case
'invalid'
|
[]
'test_case'
|
:test_case
end
with_them
do
it
'returns the correct response'
,
:aggregate_failures
do
issues
=
Array
(
expected
).
flat_map
{
|
sym
|
public_send
(
sym
)
}
params
=
{
group_id:
group
,
issue_types:
issue_types
}.
compact
get
:issues
,
params:
params
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
).
to
be_an
(
Array
)
expect
(
json_response
.
size
).
to
eq
(
issues
.
size
)
expect
(
json_response
.
map
{
|
issue
|
issue
[
'iid'
]
})
.
to
match_array
(
issues
.
map
(
&
:iid
))
end
end
end
describe
'#epics'
do
it
'returns 200 status'
do
get
:epics
,
params:
{
group_id:
group
}
...
...
@@ -58,61 +87,6 @@ RSpec.describe Groups::AutocompleteSourcesController do
end
end
describe
'#issues'
do
using
RSpec
::
Parameterized
::
TableSyntax
let_it_be
(
:project
)
{
create
(
:project
,
group:
group
)
}
let_it_be
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
let_it_be
(
:incident
)
{
create
(
:incident
,
project:
project
)
}
let_it_be
(
:test_case
)
{
create
(
:quality_test_case
,
project:
project
)
}
let
(
:none
)
{
[]
}
let
(
:all
)
{
[
issue
,
incident
,
test_case
]
}
where
(
:issue_types
,
:expected
)
do
nil
|
:all
''
|
:all
'invalid'
|
:none
'issue'
|
:issue
'incident'
|
:incident
'test_case'
|
:test_case
end
with_them
do
it
'returns the correct response'
,
:aggregate_failures
do
issues
=
Array
(
expected
).
flat_map
{
|
sym
|
public_send
(
sym
)
}
params
=
{
group_id:
group
,
issue_types:
issue_types
}.
compact
get
:issues
,
params:
params
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
).
to
be_an
(
Array
)
expect
(
json_response
.
size
).
to
eq
(
issues
.
size
)
expect
(
json_response
.
map
{
|
issue
|
issue
[
'iid'
]
})
.
to
match_array
(
issues
.
map
(
&
:iid
))
end
end
end
describe
'#milestones'
do
it
'returns correct response'
do
parent_group
=
create
(
:group
,
:private
)
group
.
update!
(
parent:
parent_group
)
sub_group
=
create
(
:group
,
:private
,
parent:
sub_group
)
create
(
:milestone
,
group:
parent_group
)
create
(
:milestone
,
group:
sub_group
)
group_milestone
=
create
(
:milestone
,
group:
group
)
get
:milestones
,
params:
{
group_id:
group
}
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
.
count
).
to
eq
(
1
)
expect
(
json_response
.
first
).
to
include
(
'iid'
=>
group_milestone
.
iid
,
'title'
=>
group_milestone
.
title
)
end
end
describe
'#commands'
do
it
'returns 200 status'
do
get
:commands
,
params:
{
group_id:
group
,
type:
'Epic'
,
type_id:
epic
.
iid
}
...
...
ee/spec/services/groups/autocomplete_service_spec.rb
→
ee/spec/services/
ee/
groups/autocomplete_service_spec.rb
View file @
5eca31cb
...
...
@@ -26,14 +26,6 @@ RSpec.describe Groups::AutocompleteService do
let!
(
:sub_group_label
)
{
create
(
:group_label
,
group:
sub_group
)
}
let!
(
:parent_group_label
)
{
create
(
:group_label
,
group:
group
.
parent
)
}
it
'returns labels from own group and ancestor groups'
do
results
=
subject
.
labels_as_hash
(
nil
)
expected_labels
=
[
label1
,
label2
,
parent_group_label
]
expect_labels_to_equal
(
results
,
expected_labels
)
end
context
'some labels are already assigned'
do
before
do
epic
.
labels
<<
label1
...
...
@@ -57,41 +49,6 @@ RSpec.describe Groups::AutocompleteService do
end
end
describe
'#issues'
do
let
(
:project
)
{
create
(
:project
,
group:
group
)
}
let
(
:sub_group_project
)
{
create
(
:project
,
group:
sub_group
)
}
let!
(
:project_issue
)
{
create
(
:issue
,
project:
project
)
}
let!
(
:sub_group_project_issue
)
{
create
(
:issue
,
confidential:
true
,
project:
sub_group_project
)
}
it
'returns issues in group and subgroups'
do
issues
=
subject
.
issues
expect
(
issues
.
map
(
&
:iid
)).
to
contain_exactly
(
project_issue
.
iid
,
sub_group_project_issue
.
iid
)
expect
(
issues
.
map
(
&
:title
)).
to
contain_exactly
(
project_issue
.
title
,
sub_group_project_issue
.
title
)
end
it
'returns only confidential issues if confidential_only is true'
do
issues
=
subject
.
issues
(
confidential_only:
true
)
expect
(
issues
.
map
(
&
:iid
)).
to
contain_exactly
(
sub_group_project_issue
.
iid
)
expect
(
issues
.
map
(
&
:title
)).
to
contain_exactly
(
sub_group_project_issue
.
title
)
end
end
describe
'#merge_requests'
do
let
(
:project
)
{
create
(
:project
,
:repository
,
group:
group
)
}
let
(
:sub_group_project
)
{
create
(
:project
,
:repository
,
group:
sub_group
)
}
let!
(
:project_mr
)
{
create
(
:merge_request
,
source_project:
project
)
}
let!
(
:sub_group_project_mr
)
{
create
(
:merge_request
,
source_project:
sub_group_project
)
}
it
'returns merge requests in group and subgroups'
do
expect
(
subject
.
merge_requests
.
map
(
&
:iid
)).
to
contain_exactly
(
project_mr
.
iid
,
sub_group_project_mr
.
iid
)
expect
(
subject
.
merge_requests
.
map
(
&
:title
)).
to
contain_exactly
(
project_mr
.
title
,
sub_group_project_mr
.
title
)
end
end
describe
'#epics'
do
let
(
:expected_attributes
)
{
%i(iid title group_id)
}
...
...
@@ -202,52 +159,4 @@ RSpec.describe Groups::AutocompleteService do
end
end
end
describe
'#milestones'
do
let!
(
:group_milestone
)
{
create
(
:milestone
,
group:
group
)
}
let!
(
:subgroup_milestone
)
{
create
(
:milestone
,
group:
sub_group
)
}
before
do
sub_group
.
add_maintainer
(
user
)
end
context
'when group is public'
do
let
(
:public_group
)
{
create
(
:group
,
:public
)
}
let
(
:public_subgroup
)
{
create
(
:group
,
:public
,
parent:
public_group
)
}
before
do
group_milestone
.
update
(
group:
public_group
)
subgroup_milestone
.
update
(
group:
public_subgroup
)
end
it
'returns milestones from groups and subgroups'
do
subject
=
described_class
.
new
(
public_subgroup
,
user
)
expect
(
subject
.
milestones
.
map
(
&
:iid
)).
to
contain_exactly
(
group_milestone
.
iid
,
subgroup_milestone
.
iid
)
expect
(
subject
.
milestones
.
map
(
&
:title
)).
to
contain_exactly
(
group_milestone
.
title
,
subgroup_milestone
.
title
)
end
end
it
'returns milestones from group'
do
expect
(
subject
.
milestones
.
map
(
&
:iid
)).
to
contain_exactly
(
group_milestone
.
iid
)
expect
(
subject
.
milestones
.
map
(
&
:title
)).
to
contain_exactly
(
group_milestone
.
title
)
end
it
'returns milestones from groups and subgroups'
do
milestones
=
described_class
.
new
(
sub_group
,
user
).
milestones
expect
(
milestones
.
map
(
&
:iid
)).
to
contain_exactly
(
group_milestone
.
iid
,
subgroup_milestone
.
iid
)
expect
(
milestones
.
map
(
&
:title
)).
to
contain_exactly
(
group_milestone
.
title
,
subgroup_milestone
.
title
)
end
it
'returns only milestones that user can read'
do
user
=
create
(
:user
)
sub_group
.
add_guest
(
user
)
milestones
=
described_class
.
new
(
sub_group
,
user
).
milestones
expect
(
milestones
.
map
(
&
:iid
)).
to
contain_exactly
(
subgroup_milestone
.
iid
)
expect
(
milestones
.
map
(
&
:title
)).
to
contain_exactly
(
subgroup_milestone
.
title
)
end
end
end
spec/controllers/groups/autocomplete_sources_controller_spec.rb
0 → 100644
View file @
5eca31cb
# frozen_string_literal: true
require
'spec_helper'
RSpec
.
describe
Groups
::
AutocompleteSourcesController
do
let_it_be
(
:user
)
{
create
(
:user
)
}
let_it_be_with_reload
(
:group
)
{
create
(
:group
,
:private
)
}
before_all
do
group
.
add_developer
(
user
)
end
before
do
sign_in
(
user
)
end
describe
'#issues'
do
using
RSpec
::
Parameterized
::
TableSyntax
let_it_be
(
:project
)
{
create
(
:project
,
group:
group
)
}
let_it_be
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
let_it_be
(
:incident
)
{
create
(
:incident
,
project:
project
)
}
let
(
:none
)
{
[]
}
let
(
:all
)
{
[
issue
,
incident
]
}
where
(
:issue_types
,
:expected
)
do
nil
|
:all
''
|
:all
'invalid'
|
:none
'issue'
|
:issue
'incident'
|
:incident
end
with_them
do
it
'returns the correct response'
,
:aggregate_failures
do
issues
=
Array
(
expected
).
flat_map
{
|
sym
|
public_send
(
sym
)
}
params
=
{
group_id:
group
,
issue_types:
issue_types
}.
compact
get
:issues
,
params:
params
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
).
to
be_an
(
Array
)
expect
(
json_response
.
size
).
to
eq
(
issues
.
size
)
expect
(
json_response
.
map
{
|
issue
|
issue
[
'iid'
]
})
.
to
match_array
(
issues
.
map
(
&
:iid
))
end
end
end
describe
'#milestones'
do
it
'returns correct response'
do
parent_group
=
create
(
:group
,
:private
)
group
.
update!
(
parent:
parent_group
)
sub_group
=
create
(
:group
,
:private
,
parent:
sub_group
)
create
(
:milestone
,
group:
parent_group
)
create
(
:milestone
,
group:
sub_group
)
group_milestone
=
create
(
:milestone
,
group:
group
)
get
:milestones
,
params:
{
group_id:
group
}
expect
(
response
).
to
have_gitlab_http_status
(
:ok
)
expect
(
json_response
.
count
).
to
eq
(
1
)
expect
(
json_response
.
first
).
to
include
(
'iid'
=>
group_milestone
.
iid
,
'title'
=>
group_milestone
.
title
)
end
end
end
spec/features/groups/milestone_spec.rb
View file @
5eca31cb
...
...
@@ -54,11 +54,11 @@ RSpec.describe 'Group milestones' do
expect
(
find
(
'.start_date'
)).
to
have_content
(
Date
.
today
.
at_beginning_of_month
.
strftime
(
'%b %-d, %Y'
))
end
it
'description input
does not
support autocomplete'
do
it
'description input support autocomplete'
do
description
=
find
(
'.note-textarea'
)
description
.
native
.
send_keys
(
'!'
)
expect
(
page
).
not_
to
have_selector
(
'.atwho-view'
)
expect
(
page
).
to
have_selector
(
'.atwho-view'
)
end
end
...
...
spec/features/groups/milestones/gfm_autocomplete_spec.rb
0 → 100644
View file @
5eca31cb
# frozen_string_literal: true
require
'spec_helper'
RSpec
.
describe
'GFM autocomplete'
,
:js
do
let_it_be
(
:user
)
{
create
(
:user
,
name:
'💃speciąl someone💃'
,
username:
'someone.special'
)
}
let_it_be
(
:group
)
{
create
(
:group
,
name:
'Ancestor'
)
}
let_it_be
(
:project
)
{
create
(
:project
,
:repository
,
group:
group
)
}
let_it_be
(
:issue
)
{
create
(
:issue
,
project:
project
,
assignees:
[
user
],
title:
'My special issue'
)
}
let_it_be
(
:label
)
{
create
(
:group_label
,
group:
group
,
title:
'special+'
)
}
let_it_be
(
:milestone
)
{
create
(
:milestone
,
resource_parent:
group
,
title:
"group milestone"
)
}
let_it_be
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
shared_examples
'displays autocomplete menu for all entities'
do
it
'autocompletes all available entities'
do
fill_in
'Description'
,
with:
User
.
reference_prefix
wait_for_requests
expect
(
find_autocomplete_menu
).
to
be_visible
expect_autocomplete_entry
(
group
.
name
)
fill_in
'Description'
,
with:
Label
.
reference_prefix
wait_for_requests
expect
(
find_autocomplete_menu
).
to
be_visible
expect_autocomplete_entry
(
label
.
title
)
fill_in
'Description'
,
with:
Milestone
.
reference_prefix
wait_for_requests
expect
(
find_autocomplete_menu
).
to
be_visible
expect_autocomplete_entry
(
milestone
.
title
)
fill_in
'Description'
,
with:
Issue
.
reference_prefix
wait_for_requests
expect
(
find_autocomplete_menu
).
to
be_visible
expect_autocomplete_entry
(
issue
.
title
)
fill_in
'Description'
,
with:
MergeRequest
.
reference_prefix
wait_for_requests
expect
(
find_autocomplete_menu
).
to
be_visible
expect_autocomplete_entry
(
merge_request
.
title
)
end
end
before_all
do
group
.
add_maintainer
(
user
)
end
describe
'new milestone page'
do
before
do
sign_in
(
user
)
visit
new_group_milestone_path
(
group
)
wait_for_requests
end
it_behaves_like
'displays autocomplete menu for all entities'
end
describe
'update milestone page'
do
before
do
sign_in
(
user
)
visit
edit_group_milestone_path
(
group
,
milestone
)
wait_for_requests
end
it_behaves_like
'displays autocomplete menu for all entities'
end
private
def
find_autocomplete_menu
find
(
'.atwho-view ul'
,
visible:
true
)
end
def
expect_autocomplete_entry
(
entry
)
page
.
within
(
'.atwho-container'
)
do
expect
(
page
).
to
have_content
(
entry
)
end
end
end
spec/features/projects/milestones/gfm_autocomplete_spec.rb
0 → 100644
View file @
5eca31cb
# frozen_string_literal: true
require
'spec_helper'
RSpec
.
describe
'GFM autocomplete'
,
:js
do
let_it_be
(
:user
)
{
create
(
:user
,
name:
'💃speciąl someone💃'
,
username:
'someone.special'
)
}
let_it_be
(
:group
)
{
create
(
:group
,
name:
'Ancestor'
)
}
let_it_be
(
:project
)
{
create
(
:project
,
:repository
,
group:
group
)
}
let_it_be
(
:issue
)
{
create
(
:issue
,
project:
project
,
assignees:
[
user
],
title:
'My special issue'
)
}
let_it_be
(
:label
)
{
create
(
:label
,
project:
project
,
title:
'special+'
)
}
let_it_be
(
:milestone
)
{
create
(
:milestone
,
resource_parent:
project
,
title:
"project milestone"
)
}
let_it_be
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
shared_examples
'displays autocomplete menu for all entities'
do
it
'autocompletes all available entities'
do
fill_in
'Description'
,
with:
User
.
reference_prefix
wait_for_requests
expect
(
find_autocomplete_menu
).
to
be_visible
expect_autocomplete_entry
(
user
.
name
)
fill_in
'Description'
,
with:
Label
.
reference_prefix
wait_for_requests
expect
(
find_autocomplete_menu
).
to
be_visible
expect_autocomplete_entry
(
label
.
title
)
fill_in
'Description'
,
with:
Milestone
.
reference_prefix
wait_for_requests
expect
(
find_autocomplete_menu
).
to
be_visible
expect_autocomplete_entry
(
milestone
.
title
)
fill_in
'Description'
,
with:
Issue
.
reference_prefix
wait_for_requests
expect
(
find_autocomplete_menu
).
to
be_visible
expect_autocomplete_entry
(
issue
.
title
)
fill_in
'Description'
,
with:
MergeRequest
.
reference_prefix
wait_for_requests
expect
(
find_autocomplete_menu
).
to
be_visible
expect_autocomplete_entry
(
merge_request
.
title
)
end
end
before_all
do
group
.
add_maintainer
(
user
)
end
describe
'new milestone page'
do
before
do
sign_in
(
user
)
visit
new_project_milestone_path
(
project
)
wait_for_requests
end
it_behaves_like
'displays autocomplete menu for all entities'
end
describe
'update milestone page'
do
before
do
sign_in
(
user
)
visit
edit_project_milestone_path
(
project
,
milestone
)
wait_for_requests
end
it_behaves_like
'displays autocomplete menu for all entities'
end
private
def
find_autocomplete_menu
find
(
'.atwho-view ul'
,
visible:
true
)
end
def
expect_autocomplete_entry
(
entry
)
page
.
within
(
'.atwho-container'
)
do
expect
(
page
).
to
have_content
(
entry
)
end
end
end
spec/helpers/application_helper_spec.rb
View file @
5eca31cb
...
...
@@ -284,6 +284,20 @@ RSpec.describe ApplicationHelper do
end
describe
'#autocomplete_data_sources'
do
context
'group'
do
let
(
:group
)
{
create
(
:group
)
}
let
(
:noteable_type
)
{
Issue
}
it
'returns paths for autocomplete_sources_controller'
do
sources
=
helper
.
autocomplete_data_sources
(
group
,
noteable_type
)
expect
(
sources
.
keys
).
to
include
(
:members
,
:issues
,
:mergeRequests
,
:labels
,
:milestones
,
:commands
)
sources
.
keys
.
each
do
|
key
|
expect
(
sources
[
key
]).
not_to
be_nil
end
end
end
context
'project'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:noteable_type
)
{
Issue
}
...
...
@@ -295,6 +309,7 @@ RSpec.describe ApplicationHelper do
end
end
end
end
describe
'#external_storage_url_or_path'
do
let
(
:project
)
{
create
(
:project
)
}
...
...
ee/
spec/serializers/group_issuable_autocomplete_entity_spec.rb
→
spec/serializers/group_issuable_autocomplete_entity_spec.rb
View file @
5eca31cb
File moved
spec/services/groups/autocomplete_service_spec.rb
0 → 100644
View file @
5eca31cb
# frozen_string_literal: true
require
'spec_helper'
RSpec
.
describe
Groups
::
AutocompleteService
do
let_it_be
(
:group
,
refind:
true
)
{
create
(
:group
,
:nested
,
:private
,
avatar:
fixture_file_upload
(
'spec/fixtures/dk.png'
))
}
let_it_be
(
:sub_group
)
{
create
(
:group
,
:private
,
parent:
group
)
}
let
(
:user
)
{
create
(
:user
)
}
subject
{
described_class
.
new
(
group
,
user
)
}
before
do
group
.
add_developer
(
user
)
end
def
expect_labels_to_equal
(
labels
,
expected_labels
)
extract_title
=
lambda
{
|
label
|
label
[
'title'
]
}
expect
(
labels
.
map
(
&
extract_title
)).
to
match_array
(
expected_labels
.
map
(
&
extract_title
))
end
describe
'#labels_as_hash'
do
let!
(
:label1
)
{
create
(
:group_label
,
group:
group
)
}
let!
(
:label2
)
{
create
(
:group_label
,
group:
group
)
}
let!
(
:sub_group_label
)
{
create
(
:group_label
,
group:
sub_group
)
}
let!
(
:parent_group_label
)
{
create
(
:group_label
,
group:
group
.
parent
)
}
it
'returns labels from own group and ancestor groups'
do
results
=
subject
.
labels_as_hash
(
nil
)
expected_labels
=
[
label1
,
label2
,
parent_group_label
]
expect_labels_to_equal
(
results
,
expected_labels
)
end
end
describe
'#issues'
do
let
(
:project
)
{
create
(
:project
,
group:
group
)
}
let
(
:sub_group_project
)
{
create
(
:project
,
group:
sub_group
)
}
let!
(
:project_issue
)
{
create
(
:issue
,
project:
project
)
}
let!
(
:sub_group_project_issue
)
{
create
(
:issue
,
confidential:
true
,
project:
sub_group_project
)
}
it
'returns issues in group and subgroups'
do
issues
=
subject
.
issues
expect
(
issues
.
map
(
&
:iid
)).
to
contain_exactly
(
project_issue
.
iid
,
sub_group_project_issue
.
iid
)
expect
(
issues
.
map
(
&
:title
)).
to
contain_exactly
(
project_issue
.
title
,
sub_group_project_issue
.
title
)
end
it
'returns only confidential issues if confidential_only is true'
do
issues
=
subject
.
issues
(
confidential_only:
true
)
expect
(
issues
.
map
(
&
:iid
)).
to
contain_exactly
(
sub_group_project_issue
.
iid
)
expect
(
issues
.
map
(
&
:title
)).
to
contain_exactly
(
sub_group_project_issue
.
title
)
end
end
describe
'#merge_requests'
do
let
(
:project
)
{
create
(
:project
,
:repository
,
group:
group
)
}
let
(
:sub_group_project
)
{
create
(
:project
,
:repository
,
group:
sub_group
)
}
let!
(
:project_mr
)
{
create
(
:merge_request
,
source_project:
project
)
}
let!
(
:sub_group_project_mr
)
{
create
(
:merge_request
,
source_project:
sub_group_project
)
}
it
'returns merge requests in group and subgroups'
do
expect
(
subject
.
merge_requests
.
map
(
&
:iid
)).
to
contain_exactly
(
project_mr
.
iid
,
sub_group_project_mr
.
iid
)
expect
(
subject
.
merge_requests
.
map
(
&
:title
)).
to
contain_exactly
(
project_mr
.
title
,
sub_group_project_mr
.
title
)
end
end
describe
'#milestones'
do
let!
(
:group_milestone
)
{
create
(
:milestone
,
group:
group
)
}
let!
(
:subgroup_milestone
)
{
create
(
:milestone
,
group:
sub_group
)
}
before
do
sub_group
.
add_maintainer
(
user
)
end
context
'when group is public'
do
let
(
:public_group
)
{
create
(
:group
,
:public
)
}
let
(
:public_subgroup
)
{
create
(
:group
,
:public
,
parent:
public_group
)
}
before
do
group_milestone
.
update!
(
group:
public_group
)
subgroup_milestone
.
update!
(
group:
public_subgroup
)
end
it
'returns milestones from groups and subgroups'
do
subject
=
described_class
.
new
(
public_subgroup
,
user
)
expect
(
subject
.
milestones
.
map
(
&
:iid
)).
to
contain_exactly
(
group_milestone
.
iid
,
subgroup_milestone
.
iid
)
expect
(
subject
.
milestones
.
map
(
&
:title
)).
to
contain_exactly
(
group_milestone
.
title
,
subgroup_milestone
.
title
)
end
end
it
'returns milestones from group'
do
expect
(
subject
.
milestones
.
map
(
&
:iid
)).
to
contain_exactly
(
group_milestone
.
iid
)
expect
(
subject
.
milestones
.
map
(
&
:title
)).
to
contain_exactly
(
group_milestone
.
title
)
end
it
'returns milestones from groups and subgroups'
do
milestones
=
described_class
.
new
(
sub_group
,
user
).
milestones
expect
(
milestones
.
map
(
&
:iid
)).
to
contain_exactly
(
group_milestone
.
iid
,
subgroup_milestone
.
iid
)
expect
(
milestones
.
map
(
&
:title
)).
to
contain_exactly
(
group_milestone
.
title
,
subgroup_milestone
.
title
)
end
it
'returns only milestones that user can read'
do
user
=
create
(
:user
)
sub_group
.
add_guest
(
user
)
milestones
=
described_class
.
new
(
sub_group
,
user
).
milestones
expect
(
milestones
.
map
(
&
:iid
)).
to
contain_exactly
(
subgroup_milestone
.
iid
)
expect
(
milestones
.
map
(
&
:title
)).
to
contain_exactly
(
subgroup_milestone
.
title
)
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