Commit 876ab5d7 authored by Mike Greiling's avatar Mike Greiling

Merge branch...

Merge branch '196647-replace-underscore-with-lodash-for-spec-javascripts-filtered_search' into 'master'

Underscore to lodash for spec/javascripts/filtered_search

Closes #196647

See merge request gitlab-org/gitlab!25698
parents df760e1c d61557ae
import _ from 'underscore'; import { escape as esc } from 'lodash';
import VisualTokenValue from '~/filtered_search/visual_token_value'; import VisualTokenValue from '~/filtered_search/visual_token_value';
import AjaxCache from '~/lib/utils/ajax_cache'; import AjaxCache from '~/lib/utils/ajax_cache';
import UsersCache from '~/lib/utils/users_cache'; import UsersCache from '~/lib/utils/users_cache';
...@@ -121,7 +121,7 @@ describe('Filtered Search Visual Tokens', () => { ...@@ -121,7 +121,7 @@ describe('Filtered Search Visual Tokens', () => {
expect(tokenValueElement.innerText.trim()).toBe(dummyUser.name); expect(tokenValueElement.innerText.trim()).toBe(dummyUser.name);
tokenValueElement.querySelector('.avatar').remove(); tokenValueElement.querySelector('.avatar').remove();
expect(tokenValueElement.innerHTML.trim()).toBe(_.escape(dummyUser.name)); expect(tokenValueElement.innerHTML.trim()).toBe(esc(dummyUser.name));
}) })
.then(done) .then(done)
.catch(done.fail); .catch(done.fail);
......
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