Commit 6fc51682 authored by Clement Ho's avatar Clement Ho

Merge branch 'winh-search-page-filters' into 'master'

Filter groups and projects dropdowns of search page on backend

Closes #38739

See merge request gitlab-org/gitlab-ce!16336
parents 5392568e be8c4af8
...@@ -15,6 +15,7 @@ export default class Search { ...@@ -15,6 +15,7 @@ export default class Search {
$groupDropdown.glDropdown({ $groupDropdown.glDropdown({
selectable: true, selectable: true,
filterable: true, filterable: true,
filterRemote: true,
fieldName: 'group_id', fieldName: 'group_id',
search: { search: {
fields: ['full_name'], fields: ['full_name'],
...@@ -43,6 +44,7 @@ export default class Search { ...@@ -43,6 +44,7 @@ export default class Search {
$projectDropdown.glDropdown({ $projectDropdown.glDropdown({
selectable: true, selectable: true,
filterable: true, filterable: true,
filterRemote: true,
fieldName: 'project_id', fieldName: 'project_id',
search: { search: {
fields: ['name'], fields: ['name'],
......
---
title: Filter groups and projects dropdowns of search page on backend
merge_request: 16336
author:
type: fixed
require 'spec_helper'
describe SearchController, '(JavaScript fixtures)', type: :controller do
include JavaScriptFixturesHelpers
render_views
before(:all) do
clean_frontend_fixtures('search/')
end
it 'search/show.html.raw' do |example|
get :show
expect(response).to be_success
store_frontend_fixture(response, example.description)
end
end
import Api from '~/api';
import Search from '~/pages/search/show/search';
describe('Search', () => {
const fixturePath = 'search/show.html.raw';
const searchTerm = 'some search';
const fillDropdownInput = (dropdownSelector) => {
const dropdownElement = document.querySelector(dropdownSelector).parentNode;
const inputElement = dropdownElement.querySelector('.dropdown-input-field');
inputElement.value = searchTerm;
return inputElement;
};
preloadFixtures(fixturePath);
beforeEach(() => {
loadFixtures(fixturePath);
new Search(); // eslint-disable-line no-new
});
it('requests groups from backend when filtering', (done) => {
spyOn(Api, 'groups').and.callFake((term) => {
expect(term).toBe(searchTerm);
done();
});
const inputElement = fillDropdownInput('.js-search-group-dropdown');
$(inputElement).trigger('input');
});
it('requests projects from backend when filtering', (done) => {
spyOn(Api, 'projects').and.callFake((term) => {
expect(term).toBe(searchTerm);
done();
});
const inputElement = fillDropdownInput('.js-search-project-dropdown');
$(inputElement).trigger('input');
});
});
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