Commit 4b383fa1 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '204800-convert-to-jest-branches-select-component' into 'master'

Convert branches-select component to jest

Closes #204800

See merge request gitlab-org/gitlab!25954
parents 52f0a475 98b1bda5
...@@ -8,7 +8,6 @@ const TEST_DEFAULT_BRANCH = { name: 'Any branch' }; ...@@ -8,7 +8,6 @@ const TEST_DEFAULT_BRANCH = { name: 'Any branch' };
const TEST_PROJECT_ID = '1'; const TEST_PROJECT_ID = '1';
const TEST_PROTECTED_BRANCHES = [{ id: 1, name: 'master' }, { id: 2, name: 'development' }]; const TEST_PROTECTED_BRANCHES = [{ id: 1, name: 'master' }, { id: 2, name: 'development' }];
const TEST_BRANCHES_SELECTIONS = [TEST_DEFAULT_BRANCH, ...TEST_PROTECTED_BRANCHES]; const TEST_BRANCHES_SELECTIONS = [TEST_DEFAULT_BRANCH, ...TEST_PROTECTED_BRANCHES];
const DEBOUNCE_TIME = 250;
const waitForEvent = ($input, event) => new Promise(resolve => $input.one(event, resolve)); const waitForEvent = ($input, event) => new Promise(resolve => $input.one(event, resolve));
const select2Container = () => document.querySelector('.select2-container'); const select2Container = () => document.querySelector('.select2-container');
const select2DropdownOptions = () => document.querySelectorAll('.result-name'); const select2DropdownOptions = () => document.querySelectorAll('.result-name');
...@@ -39,18 +38,18 @@ describe('Branches Select', () => { ...@@ -39,18 +38,18 @@ describe('Branches Select', () => {
const search = (term = '') => { const search = (term = '') => {
$input.select2('search', term); $input.select2('search', term);
jasmine.clock().tick(DEBOUNCE_TIME); jest.runAllTimers();
}; };
beforeEach(() => { beforeEach(() => {
jasmine.clock().install(); jest.useFakeTimers();
spyOn(Api, 'projectProtectedBranches').and.returnValue( jest
Promise.resolve(TEST_PROTECTED_BRANCHES), .spyOn(Api, 'projectProtectedBranches')
); .mockReturnValue(Promise.resolve(TEST_PROTECTED_BRANCHES));
}); });
afterEach(() => { afterEach(() => {
jasmine.clock().uninstall(); jest.clearAllTimers();
wrapper.destroy(); wrapper.destroy();
}); });
...@@ -84,6 +83,7 @@ describe('Branches Select', () => { ...@@ -84,6 +83,7 @@ describe('Branches Select', () => {
it('fetches protected branches with search term', done => { it('fetches protected branches with search term', done => {
const term = 'lorem'; const term = 'lorem';
waitForEvent($input, 'select2-loaded') waitForEvent($input, 'select2-loaded')
.then(() => {})
.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