diff --git a/spec/javascripts/serverless/components/area_spec.js b/spec/frontend/serverless/components/area_spec.js similarity index 96% rename from spec/javascripts/serverless/components/area_spec.js rename to spec/frontend/serverless/components/area_spec.js index 2be6ac3d268893a620852bf6ae0abb69ff2652ca..62005e1981ae06885c98aaaacf93cb2bdbaba7da 100644 --- a/spec/javascripts/serverless/components/area_spec.js +++ b/spec/frontend/serverless/components/area_spec.js @@ -16,6 +16,7 @@ describe('Area component', () => { slots: { default: mockWidgets, }, + sync: false, }); }); @@ -67,7 +68,7 @@ describe('Area component', () => { const mockWidth = 233; beforeEach(() => { - spyOn(Element.prototype, 'getBoundingClientRect').and.callFake(() => ({ + jest.spyOn(Element.prototype, 'getBoundingClientRect').mockImplementation(() => ({ width: mockWidth, })); areaChart.vm.onResize(); diff --git a/spec/javascripts/serverless/components/environment_row_spec.js b/spec/frontend/serverless/components/environment_row_spec.js similarity index 98% rename from spec/javascripts/serverless/components/environment_row_spec.js rename to spec/frontend/serverless/components/environment_row_spec.js index 932d712dbecd50469e68dd166b0ddf2f4da5c9f4..161a637dd75a3e39314b4c5513bde9be8c8f8fdb 100644 --- a/spec/javascripts/serverless/components/environment_row_spec.js +++ b/spec/frontend/serverless/components/environment_row_spec.js @@ -5,7 +5,7 @@ import { mockServerlessFunctions, mockServerlessFunctionsDiffEnv } from '../mock import { translate } from '~/serverless/utils'; const createComponent = (localVue, env, envName) => - shallowMount(environmentRowComponent, { localVue, propsData: { env, envName } }).vm; + shallowMount(environmentRowComponent, { localVue, propsData: { env, envName }, sync: false }).vm; describe('environment row component', () => { describe('default global cluster case', () => { diff --git a/spec/javascripts/serverless/components/function_details_spec.js b/spec/frontend/serverless/components/function_details_spec.js similarity index 97% rename from spec/javascripts/serverless/components/function_details_spec.js rename to spec/frontend/serverless/components/function_details_spec.js index a29d4a296ef90860f0cb03154539385b98edec17..31348ff119483f2a385b577dd8cb0cf2df3bedc5 100644 --- a/spec/javascripts/serverless/components/function_details_spec.js +++ b/spec/frontend/serverless/components/function_details_spec.js @@ -41,6 +41,7 @@ describe('functionDetailsComponent', () => { clustersPath: '/clusters', helpPath: '/help', }, + sync: false, }); expect( @@ -68,6 +69,7 @@ describe('functionDetailsComponent', () => { clustersPath: '/clusters', helpPath: '/help', }, + sync: false, }); expect(component.vm.$el.querySelector('p').innerHTML.trim()).toContain('1 pod in use'); @@ -85,6 +87,7 @@ describe('functionDetailsComponent', () => { clustersPath: '/clusters', helpPath: '/help', }, + sync: false, }); expect(component.vm.$el.querySelector('p').innerHTML.trim()).toContain('3 pods in use'); @@ -102,6 +105,7 @@ describe('functionDetailsComponent', () => { clustersPath: '/clusters', helpPath: '/help', }, + sync: false, }); expect( diff --git a/spec/javascripts/serverless/components/function_row_spec.js b/spec/frontend/serverless/components/function_row_spec.js similarity index 88% rename from spec/javascripts/serverless/components/function_row_spec.js rename to spec/frontend/serverless/components/function_row_spec.js index 3987e1753bd0bd7391b3b266388ce138cdd2a4f1..414fdc5cd82bd016ed8fdf463b03ac6e13587315 100644 --- a/spec/javascripts/serverless/components/function_row_spec.js +++ b/spec/frontend/serverless/components/function_row_spec.js @@ -3,7 +3,8 @@ import { shallowMount } from '@vue/test-utils'; import { mockServerlessFunction } from '../mock_data'; -const createComponent = func => shallowMount(functionRowComponent, { propsData: { func } }).vm; +const createComponent = func => + shallowMount(functionRowComponent, { propsData: { func }, sync: false }).vm; describe('functionRowComponent', () => { it('Parses the function details correctly', () => { diff --git a/spec/javascripts/serverless/components/functions_spec.js b/spec/frontend/serverless/components/functions_spec.js similarity index 86% rename from spec/javascripts/serverless/components/functions_spec.js rename to spec/frontend/serverless/components/functions_spec.js index c32978ea58a3b4c3fb2c20b81e7a64969eb5aed4..5533de1a70a09ac0e873d97c578d213e627aaeb8 100644 --- a/spec/javascripts/serverless/components/functions_spec.js +++ b/spec/frontend/serverless/components/functions_spec.js @@ -1,5 +1,6 @@ import Vuex from 'vuex'; - +import AxiosMockAdapter from 'axios-mock-adapter'; +import axios from '~/lib/utils/axios_utils'; import functionsComponent from '~/serverless/components/functions.vue'; import { createLocalVue, shallowMount } from '@vue/test-utils'; import { createStore } from '~/serverless/store'; @@ -79,15 +80,19 @@ describe('functionsComponent', () => { ); }); - it('should render the functions list', () => { + fit('should render the functions list', () => { + const statusPath = 'statusPath'; + const axiosMock = new AxiosMockAdapter(axios); + axiosMock.onGet(statusPath).reply(200); + component = shallowMount(functionsComponent, { localVue, store, propsData: { installed: true, - clustersPath: '', - helpPath: '', - statusPath: '', + clustersPath: 'clustersPath', + helpPath: 'helpPath', + statusPath, }, sync: false, }); diff --git a/spec/javascripts/serverless/components/missing_prometheus_spec.js b/spec/frontend/serverless/components/missing_prometheus_spec.js similarity index 98% rename from spec/javascripts/serverless/components/missing_prometheus_spec.js rename to spec/frontend/serverless/components/missing_prometheus_spec.js index 77aca03772bc9c96fa0145e91f7f3f8b4cf5e84f..d0df612529059eb84bfeb3c15aa23fbc6985e199 100644 --- a/spec/javascripts/serverless/components/missing_prometheus_spec.js +++ b/spec/frontend/serverless/components/missing_prometheus_spec.js @@ -8,6 +8,7 @@ const createComponent = missingData => helpPath: '/help', missingData, }, + sync: false, }).vm; describe('missingPrometheusComponent', () => { diff --git a/spec/javascripts/serverless/components/pod_box_spec.js b/spec/frontend/serverless/components/pod_box_spec.js similarity index 97% rename from spec/javascripts/serverless/components/pod_box_spec.js rename to spec/frontend/serverless/components/pod_box_spec.js index 69ac1a2bb5f127670e8c9111251865c5a34d6a2a..d82825d8f6234d33bab76e46924db596d966d0f4 100644 --- a/spec/javascripts/serverless/components/pod_box_spec.js +++ b/spec/frontend/serverless/components/pod_box_spec.js @@ -6,6 +6,7 @@ const createComponent = count => propsData: { count, }, + sync: false, }).vm; describe('podBoxComponent', () => { diff --git a/spec/javascripts/serverless/components/url_spec.js b/spec/frontend/serverless/components/url_spec.js similarity index 97% rename from spec/javascripts/serverless/components/url_spec.js rename to spec/frontend/serverless/components/url_spec.js index 08c3e4146b1c6efc9879a463247ba6cd3bda70c0..d05a9bba10328e3698e8edf0ffc4ff2a2fa073b7 100644 --- a/spec/javascripts/serverless/components/url_spec.js +++ b/spec/frontend/serverless/components/url_spec.js @@ -7,6 +7,7 @@ const createComponent = uri => propsData: { uri, }, + sync: false, }).vm; describe('urlComponent', () => { diff --git a/spec/javascripts/serverless/mock_data.js b/spec/frontend/serverless/mock_data.js similarity index 100% rename from spec/javascripts/serverless/mock_data.js rename to spec/frontend/serverless/mock_data.js diff --git a/spec/javascripts/serverless/store/actions_spec.js b/spec/frontend/serverless/store/actions_spec.js similarity index 95% rename from spec/javascripts/serverless/store/actions_spec.js rename to spec/frontend/serverless/store/actions_spec.js index 602798573e9fbd0eb359c7f342655cdcdd0d09ee..aac57c75a4f9f3015ed0b1e3e76c5881e7df0f4b 100644 --- a/spec/javascripts/serverless/store/actions_spec.js +++ b/spec/frontend/serverless/store/actions_spec.js @@ -32,7 +32,9 @@ describe('ServerlessActions', () => { it('should successfully retry', done => { const endpoint = '/functions'; const mock = new MockAdapter(axios); - mock.onGet(endpoint).reply(statusCodes.NO_CONTENT); + mock + .onGet(endpoint) + .reply(() => new Promise(resolve => setTimeout(() => resolve(200), Infinity))); testAction( fetchFunctions, diff --git a/spec/javascripts/serverless/store/getters_spec.js b/spec/frontend/serverless/store/getters_spec.js similarity index 100% rename from spec/javascripts/serverless/store/getters_spec.js rename to spec/frontend/serverless/store/getters_spec.js diff --git a/spec/javascripts/serverless/store/mutations_spec.js b/spec/frontend/serverless/store/mutations_spec.js similarity index 100% rename from spec/javascripts/serverless/store/mutations_spec.js rename to spec/frontend/serverless/store/mutations_spec.js diff --git a/spec/javascripts/serverless/utils.js b/spec/frontend/serverless/utils.js similarity index 100% rename from spec/javascripts/serverless/utils.js rename to spec/frontend/serverless/utils.js