diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-04 00:09:37 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-04 00:09:37 +0000 |
commit | e3bdfa1a13d7e6c92716324c78b5b20c07eeb7c6 (patch) | |
tree | e8776263096b027d32d4be5118cccc87b00de2bc /spec/frontend/ide | |
parent | c1a50b8195f4e36fda9b233acbde57a449bcf6c3 (diff) | |
download | gitlab-ce-e3bdfa1a13d7e6c92716324c78b5b20c07eeb7c6.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/ide')
-rw-r--r-- | spec/frontend/ide/components/branches/search_list_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/ide/components/merge_requests/list_spec.js | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/spec/frontend/ide/components/branches/search_list_spec.js b/spec/frontend/ide/components/branches/search_list_spec.js index 826d51b24f1..fe142d70698 100644 --- a/spec/frontend/ide/components/branches/search_list_spec.js +++ b/spec/frontend/ide/components/branches/search_list_spec.js @@ -9,8 +9,6 @@ import { branches } from '../../mock_data'; const localVue = createLocalVue(); localVue.use(Vuex); -jest.mock('lodash/debounce', () => jest.fn); - describe('IDE branches search list', () => { let wrapper; const fetchBranchesMock = jest.fn(); diff --git a/spec/frontend/ide/components/merge_requests/list_spec.js b/spec/frontend/ide/components/merge_requests/list_spec.js index ae94ee4efa7..e2c6ac49e07 100644 --- a/spec/frontend/ide/components/merge_requests/list_spec.js +++ b/spec/frontend/ide/components/merge_requests/list_spec.js @@ -134,9 +134,7 @@ describe('IDE merge requests list', () => { createComponent(defaultStateWithMergeRequests); const input = findTokenedInput(); input.vm.$emit('input', 'something'); - fetchMergeRequestsMock.mockClear(); - jest.runAllTimers(); return wrapper.vm.$nextTick().then(() => { expect(fetchMergeRequestsMock).toHaveBeenCalledWith( expect.any(Object), |