Commit c35089d6 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'rd-48920-backend-support-for-clarifying-search-bar' into 'master'

Add avatar_url attr to the response of the autocomplete endpoint

Closes #48920

See merge request gitlab-org/gitlab-ce!20661
parents b341b2ad dcae1cc9
......@@ -105,7 +105,8 @@ module SearchHelper
category: "Groups",
id: group.id,
label: "#{search_result_sanitize(group.full_name)}",
url: group_path(group)
url: group_path(group),
avatar_url: group.avatar_url || ''
}
end
end
......@@ -119,7 +120,8 @@ module SearchHelper
id: p.id,
value: "#{search_result_sanitize(p.name)}",
label: "#{search_result_sanitize(p.full_name)}",
url: project_path(p)
url: project_path(p),
avatar_url: p.avatar_url || ''
}
end
end
......
......@@ -55,6 +55,20 @@ describe SearchHelper do
expect(search_autocomplete_opts(project.name).size).to eq(1)
end
it "includes the required project attrs" do
project = create(:project, namespace: create(:namespace, owner: user))
result = search_autocomplete_opts(project.name).first
expect(result.keys).to match_array(%i[category id value label url avatar_url])
end
it "includes the required group attrs" do
create(:group).add_owner(user)
result = search_autocomplete_opts("gro").first
expect(result.keys).to match_array(%i[category id label url avatar_url])
end
it "does not include the public group" do
group = create(:group)
expect(search_autocomplete_opts(group.name).size).to eq(0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment