Commit 0c1fffe2 authored by Phil Hughes's avatar Phil Hughes

Merge branch '58981-migrate-clusters-tests-to-jest' into 'master'

Migrate clusters tests to jest

Closes #58981

See merge request gitlab-org/gitlab-ce!27013
parents 20e93beb be8997ca
...@@ -262,7 +262,7 @@ export default class Clusters { ...@@ -262,7 +262,7 @@ export default class Clusters {
this.store.updateAppProperty(appId, 'requestReason', null); this.store.updateAppProperty(appId, 'requestReason', null);
this.store.updateAppProperty(appId, 'statusReason', null); this.store.updateAppProperty(appId, 'statusReason', null);
this.service.installApplication(appId, data.params).catch(() => { return this.service.installApplication(appId, data.params).catch(() => {
this.store.updateAppProperty(appId, 'requestStatus', REQUEST_FAILURE); this.store.updateAppProperty(appId, 'requestStatus', REQUEST_FAILURE);
this.store.updateAppProperty( this.store.updateAppProperty(
appId, appId,
......
---
title: Migrate clusters tests to jest
merge_request: 27013
author:
type: other
...@@ -5,19 +5,41 @@ import { ...@@ -5,19 +5,41 @@ import {
APPLICATION_STATUS, APPLICATION_STATUS,
INGRESS_DOMAIN_SUFFIX, INGRESS_DOMAIN_SUFFIX,
} from '~/clusters/constants'; } from '~/clusters/constants';
import getSetTimeoutPromise from 'spec/helpers/set_timeout_promise_helper'; import MockAdapter from 'axios-mock-adapter';
import axios from '~/lib/utils/axios_utils';
import { loadHTMLFixture } from 'helpers/fixtures';
import { setTestTimeout } from 'helpers/timeout';
import $ from 'jquery';
describe('Clusters', () => { describe('Clusters', () => {
setTestTimeout(500);
let cluster; let cluster;
preloadFixtures('clusters/show_cluster.html'); let mock;
const mockGetClusterStatusRequest = () => {
const { statusPath } = document.querySelector('.js-edit-cluster-form').dataset;
mock = new MockAdapter(axios);
mock.onGet(statusPath).reply(200);
};
beforeEach(() => {
loadHTMLFixture('clusters/show_cluster.html');
});
beforeEach(() => {
mockGetClusterStatusRequest();
});
beforeEach(() => { beforeEach(() => {
loadFixtures('clusters/show_cluster.html');
cluster = new Clusters(); cluster = new Clusters();
}); });
afterEach(() => { afterEach(() => {
cluster.destroy(); cluster.destroy();
mock.restore();
}); });
describe('toggle', () => { describe('toggle', () => {
...@@ -29,16 +51,13 @@ describe('Clusters', () => { ...@@ -29,16 +51,13 @@ describe('Clusters', () => {
'.js-cluster-enable-toggle-area .js-project-feature-toggle-input', '.js-cluster-enable-toggle-area .js-project-feature-toggle-input',
); );
toggleButton.click(); $(toggleInput).one('trigger-change', () => {
expect(toggleButton.classList).not.toContain('is-checked');
getSetTimeoutPromise() expect(toggleInput.getAttribute('value')).toEqual('false');
.then(() => { done();
expect(toggleButton.classList).not.toContain('is-checked'); });
expect(toggleInput.getAttribute('value')).toEqual('false'); toggleButton.click();
})
.then(done)
.catch(done.fail);
}); });
}); });
...@@ -197,7 +216,7 @@ describe('Clusters', () => { ...@@ -197,7 +216,7 @@ describe('Clusters', () => {
describe('installApplication', () => { describe('installApplication', () => {
it('tries to install helm', () => { it('tries to install helm', () => {
spyOn(cluster.service, 'installApplication').and.returnValue(Promise.resolve()); jest.spyOn(cluster.service, 'installApplication').mockResolvedValueOnce();
expect(cluster.store.state.applications.helm.requestStatus).toEqual(null); expect(cluster.store.state.applications.helm.requestStatus).toEqual(null);
...@@ -209,7 +228,7 @@ describe('Clusters', () => { ...@@ -209,7 +228,7 @@ describe('Clusters', () => {
}); });
it('tries to install ingress', () => { it('tries to install ingress', () => {
spyOn(cluster.service, 'installApplication').and.returnValue(Promise.resolve()); jest.spyOn(cluster.service, 'installApplication').mockResolvedValueOnce();
expect(cluster.store.state.applications.ingress.requestStatus).toEqual(null); expect(cluster.store.state.applications.ingress.requestStatus).toEqual(null);
...@@ -221,7 +240,7 @@ describe('Clusters', () => { ...@@ -221,7 +240,7 @@ describe('Clusters', () => {
}); });
it('tries to install runner', () => { it('tries to install runner', () => {
spyOn(cluster.service, 'installApplication').and.returnValue(Promise.resolve()); jest.spyOn(cluster.service, 'installApplication').mockResolvedValueOnce();
expect(cluster.store.state.applications.runner.requestStatus).toEqual(null); expect(cluster.store.state.applications.runner.requestStatus).toEqual(null);
...@@ -233,7 +252,7 @@ describe('Clusters', () => { ...@@ -233,7 +252,7 @@ describe('Clusters', () => {
}); });
it('tries to install jupyter', () => { it('tries to install jupyter', () => {
spyOn(cluster.service, 'installApplication').and.returnValue(Promise.resolve()); jest.spyOn(cluster.service, 'installApplication').mockResolvedValueOnce();
expect(cluster.store.state.applications.jupyter.requestStatus).toEqual(null); expect(cluster.store.state.applications.jupyter.requestStatus).toEqual(null);
cluster.installApplication({ cluster.installApplication({
...@@ -248,35 +267,32 @@ describe('Clusters', () => { ...@@ -248,35 +267,32 @@ describe('Clusters', () => {
}); });
}); });
it('sets error request status when the request fails', done => { it('sets error request status when the request fails', () => {
spyOn(cluster.service, 'installApplication').and.returnValue( jest
Promise.reject(new Error('STUBBED ERROR')), .spyOn(cluster.service, 'installApplication')
); .mockRejectedValueOnce(new Error('STUBBED ERROR'));
expect(cluster.store.state.applications.helm.requestStatus).toEqual(null); expect(cluster.store.state.applications.helm.requestStatus).toEqual(null);
cluster.installApplication({ id: 'helm' }); const promise = cluster.installApplication({ id: 'helm' });
expect(cluster.store.state.applications.helm.requestStatus).toEqual(REQUEST_SUBMITTED); expect(cluster.store.state.applications.helm.requestStatus).toEqual(REQUEST_SUBMITTED);
expect(cluster.store.state.applications.helm.requestReason).toEqual(null); expect(cluster.store.state.applications.helm.requestReason).toEqual(null);
expect(cluster.service.installApplication).toHaveBeenCalled(); expect(cluster.service.installApplication).toHaveBeenCalled();
getSetTimeoutPromise() return promise.then(() => {
.then(() => { expect(cluster.store.state.applications.helm.requestStatus).toEqual(REQUEST_FAILURE);
expect(cluster.store.state.applications.helm.requestStatus).toEqual(REQUEST_FAILURE); expect(cluster.store.state.applications.helm.requestReason).toBeDefined();
expect(cluster.store.state.applications.helm.requestReason).toBeDefined(); });
})
.then(done)
.catch(done.fail);
}); });
}); });
describe('handleSuccess', () => { describe('handleSuccess', () => {
beforeEach(() => { beforeEach(() => {
spyOn(cluster.store, 'updateStateFromServer'); jest.spyOn(cluster.store, 'updateStateFromServer').mockReturnThis();
spyOn(cluster, 'toggleIngressDomainHelpText'); jest.spyOn(cluster, 'toggleIngressDomainHelpText').mockReturnThis();
spyOn(cluster, 'checkForNewInstalls'); jest.spyOn(cluster, 'checkForNewInstalls').mockReturnThis();
spyOn(cluster, 'updateContainer'); jest.spyOn(cluster, 'updateContainer').mockReturnThis();
cluster.handleSuccess({ data: {} }); cluster.handleSuccess({ data: {} });
}); });
......
...@@ -2,7 +2,7 @@ import Vue from 'vue'; ...@@ -2,7 +2,7 @@ import Vue from 'vue';
import eventHub from '~/clusters/event_hub'; import eventHub from '~/clusters/event_hub';
import { APPLICATION_STATUS, REQUEST_SUBMITTED, REQUEST_FAILURE } from '~/clusters/constants'; import { APPLICATION_STATUS, REQUEST_SUBMITTED, REQUEST_FAILURE } from '~/clusters/constants';
import applicationRow from '~/clusters/components/application_row.vue'; import applicationRow from '~/clusters/components/application_row.vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper'; import mountComponent from 'helpers/vue_mount_component_helper';
import { DEFAULT_APPLICATION_STATE } from '../services/mock_data'; import { DEFAULT_APPLICATION_STATE } from '../services/mock_data';
describe('Application Row', () => { describe('Application Row', () => {
...@@ -160,7 +160,7 @@ describe('Application Row', () => { ...@@ -160,7 +160,7 @@ describe('Application Row', () => {
}); });
it('clicking install button emits event', () => { it('clicking install button emits event', () => {
spyOn(eventHub, '$emit'); jest.spyOn(eventHub, '$emit');
vm = mountComponent(ApplicationRow, { vm = mountComponent(ApplicationRow, {
...DEFAULT_APPLICATION_STATE, ...DEFAULT_APPLICATION_STATE,
status: APPLICATION_STATUS.INSTALLABLE, status: APPLICATION_STATUS.INSTALLABLE,
...@@ -176,7 +176,7 @@ describe('Application Row', () => { ...@@ -176,7 +176,7 @@ describe('Application Row', () => {
}); });
it('clicking install button when installApplicationRequestParams are provided emits event', () => { it('clicking install button when installApplicationRequestParams are provided emits event', () => {
spyOn(eventHub, '$emit'); jest.spyOn(eventHub, '$emit');
vm = mountComponent(ApplicationRow, { vm = mountComponent(ApplicationRow, {
...DEFAULT_APPLICATION_STATE, ...DEFAULT_APPLICATION_STATE,
status: APPLICATION_STATUS.INSTALLABLE, status: APPLICATION_STATUS.INSTALLABLE,
...@@ -193,7 +193,7 @@ describe('Application Row', () => { ...@@ -193,7 +193,7 @@ describe('Application Row', () => {
}); });
it('clicking disabled install button emits nothing', () => { it('clicking disabled install button emits nothing', () => {
spyOn(eventHub, '$emit'); jest.spyOn(eventHub, '$emit');
vm = mountComponent(ApplicationRow, { vm = mountComponent(ApplicationRow, {
...DEFAULT_APPLICATION_STATE, ...DEFAULT_APPLICATION_STATE,
status: APPLICATION_STATUS.INSTALLING, status: APPLICATION_STATUS.INSTALLING,
...@@ -255,7 +255,7 @@ describe('Application Row', () => { ...@@ -255,7 +255,7 @@ describe('Application Row', () => {
}); });
it('clicking upgrade button emits event', () => { it('clicking upgrade button emits event', () => {
spyOn(eventHub, '$emit'); jest.spyOn(eventHub, '$emit');
vm = mountComponent(ApplicationRow, { vm = mountComponent(ApplicationRow, {
...DEFAULT_APPLICATION_STATE, ...DEFAULT_APPLICATION_STATE,
status: APPLICATION_STATUS.UPDATE_ERRORED, status: APPLICATION_STATUS.UPDATE_ERRORED,
...@@ -271,7 +271,7 @@ describe('Application Row', () => { ...@@ -271,7 +271,7 @@ describe('Application Row', () => {
}); });
it('clicking disabled upgrade button emits nothing', () => { it('clicking disabled upgrade button emits nothing', () => {
spyOn(eventHub, '$emit'); jest.spyOn(eventHub, '$emit');
vm = mountComponent(ApplicationRow, { vm = mountComponent(ApplicationRow, {
...DEFAULT_APPLICATION_STATE, ...DEFAULT_APPLICATION_STATE,
status: APPLICATION_STATUS.UPDATING, status: APPLICATION_STATUS.UPDATING,
......
...@@ -2,7 +2,7 @@ import Vue from 'vue'; ...@@ -2,7 +2,7 @@ import Vue from 'vue';
import applications from '~/clusters/components/applications.vue'; import applications from '~/clusters/components/applications.vue';
import { CLUSTER_TYPE } from '~/clusters/constants'; import { CLUSTER_TYPE } from '~/clusters/constants';
import eventHub from '~/clusters/event_hub'; import eventHub from '~/clusters/event_hub';
import mountComponent from 'spec/helpers/vue_mount_component_helper'; import mountComponent from 'helpers/vue_mount_component_helper';
import { APPLICATIONS_MOCK_STATE } from '../services/mock_data'; import { APPLICATIONS_MOCK_STATE } from '../services/mock_data';
describe('Applications', () => { describe('Applications', () => {
...@@ -314,7 +314,7 @@ describe('Applications', () => { ...@@ -314,7 +314,7 @@ describe('Applications', () => {
}); });
it('emits event when clicking Save changes button', () => { it('emits event when clicking Save changes button', () => {
spyOn(eventHub, '$emit'); jest.spyOn(eventHub, '$emit');
vm = mountComponent(Applications, props); vm = mountComponent(Applications, props);
const saveButton = vm.$el.querySelector('.js-knative-save-domain-button'); const saveButton = vm.$el.querySelector('.js-knative-save-domain-button');
......
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