Commit 3566b5b0 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Resolve remaining conflicts in frontend specs for runner view change

parent dc514da2
import DropdownUtils from '~/filtered_search/dropdown_utils';
import DropdownUser from '~/filtered_search/dropdown_user';
import FilteredSearchTokenizer from '~/filtered_search/filtered_search_tokenizer';
<<<<<<< HEAD
import IssuesFilteredSearchTokenKeys from '~/filtered_search/issues_filtered_search_token_keys';
=======
import IssuableFilteredTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys';
>>>>>>> upstream/master
describe('Dropdown User', () => {
describe('getSearchInput', () => {
......@@ -18,11 +14,7 @@ describe('Dropdown User', () => {
spyOn(DropdownUtils, 'getSearchInput').and.callFake(() => {});
dropdownUser = new DropdownUser({
<<<<<<< HEAD
tokenKeys: IssuesFilteredSearchTokenKeys,
=======
tokenKeys: IssuableFilteredTokenKeys,
>>>>>>> upstream/master
});
});
......
import DropdownUtils from '~/filtered_search/dropdown_utils';
import FilteredSearchDropdownManager from '~/filtered_search/filtered_search_dropdown_manager';
<<<<<<< HEAD
import IssuesFilteredSearchTokenKeys from '~/filtered_search/issues_filtered_search_token_keys';
=======
import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys';
>>>>>>> upstream/master
import FilteredSearchSpecHelper from '../helpers/filtered_search_spec_helper';
describe('Dropdown Utils', () => {
......@@ -141,11 +137,7 @@ describe('Dropdown Utils', () => {
`);
input = document.getElementById('test');
<<<<<<< HEAD
allowedKeys = IssuesFilteredSearchTokenKeys.getKeys();
=======
allowedKeys = IssuableFilteredSearchTokenKeys.getKeys();
>>>>>>> upstream/master
});
function config() {
......
import RecentSearchesService from '~/filtered_search/services/recent_searches_service';
import RecentSearchesServiceError from '~/filtered_search/services/recent_searches_service_error';
import RecentSearchesRoot from '~/filtered_search/recent_searches_root';
<<<<<<< HEAD
import IssuesFilteredSearchTokenKeys from '~/filtered_search/issues_filtered_search_token_keys';
=======
import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys';
>>>>>>> upstream/master
import '~/lib/utils/common_utils';
import DropdownUtils from '~/filtered_search/dropdown_utils';
import FilteredSearchVisualTokens from '~/filtered_search/filtered_search_visual_tokens';
......@@ -90,11 +86,7 @@ describe('Filtered Search Manager', function () {
expect(RecentSearchesService.isAvailable).toHaveBeenCalled();
expect(RecentSearchesStoreSpy).toHaveBeenCalledWith({
isLocalStorageAvailable,
<<<<<<< HEAD
allowedKeys: IssuesFilteredSearchTokenKeys.getKeys(),
=======
allowedKeys: IssuableFilteredSearchTokenKeys.getKeys(),
>>>>>>> upstream/master
});
});
});
......
<<<<<<< HEAD
import IssuesFilteredSearchTokenKeys from '~/filtered_search/issues_filtered_search_token_keys';
import FilteredSearchTokenizer from '~/filtered_search/filtered_search_tokenizer';
describe('Filtered Search Tokenizer', () => {
const allowedKeys = IssuesFilteredSearchTokenKeys.getKeys();
=======
import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys';
import FilteredSearchTokenizer from '~/filtered_search/filtered_search_tokenizer';
describe('Filtered Search Tokenizer', () => {
const allowedKeys = IssuableFilteredSearchTokenKeys.getKeys();
>>>>>>> upstream/master
describe('processTokens', () => {
it('returns for input containing only search value', () => {
......
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