diff --git a/packages/web-app-files/tests/helpers/path.spec.js b/packages/web-app-files/tests/unit/helpers/path.spec.js similarity index 96% rename from packages/web-app-files/tests/helpers/path.spec.js rename to packages/web-app-files/tests/unit/helpers/path.spec.js index c4b4d313adf..0c2d9b88e4d 100644 --- a/packages/web-app-files/tests/helpers/path.spec.js +++ b/packages/web-app-files/tests/unit/helpers/path.spec.js @@ -1,4 +1,4 @@ -import { getParentPaths } from '../../src/helpers/path' +import { getParentPaths } from '../../../src/helpers/path' describe('build an array of parent paths from a provided path', () => { it('should return an empty array on an empty path', () => { diff --git a/packages/web-app-files/tests/helpers/resources.spec.js b/packages/web-app-files/tests/unit/helpers/resources.spec.js similarity index 96% rename from packages/web-app-files/tests/helpers/resources.spec.js rename to packages/web-app-files/tests/unit/helpers/resources.spec.js index 5f94e1925c3..f4950e1a66b 100644 --- a/packages/web-app-files/tests/helpers/resources.spec.js +++ b/packages/web-app-files/tests/unit/helpers/resources.spec.js @@ -1,4 +1,4 @@ -import { buildSharedResource } from '../../src/helpers/resources' +import { buildSharedResource } from '../../../src/helpers/resources' describe('buildSharedResource', () => { const resourceFactory = (incomingShares = false) => { diff --git a/packages/web-app-files/tests/helpers/user.spec.js b/packages/web-app-files/tests/unit/helpers/user.spec.js similarity index 94% rename from packages/web-app-files/tests/helpers/user.spec.js rename to packages/web-app-files/tests/unit/helpers/user.spec.js index 65ce8b18e03..3749a641415 100644 --- a/packages/web-app-files/tests/helpers/user.spec.js +++ b/packages/web-app-files/tests/unit/helpers/user.spec.js @@ -1,4 +1,4 @@ -import { getAvatarSrc } from '../../src/helpers/user' +import { getAvatarSrc } from '../../../src/helpers/user' describe('getAvatarSrc', () => { it('throws an error', async () => { diff --git a/packages/web-app-files/tests/views/SharedWithMe.setup.js b/packages/web-app-files/tests/unit/views/SharedWithMe.setup.js similarity index 86% rename from packages/web-app-files/tests/views/SharedWithMe.setup.js rename to packages/web-app-files/tests/unit/views/SharedWithMe.setup.js index 507ae0472d7..4036c0544ae 100644 --- a/packages/web-app-files/tests/views/SharedWithMe.setup.js +++ b/packages/web-app-files/tests/unit/views/SharedWithMe.setup.js @@ -1,7 +1,7 @@ import { mount, createLocalVue, config } from '@vue/test-utils' import Vuex from 'vuex' import OwnCloud from 'owncloud-sdk' -import SharedWithMe from '../../src/views/SharedWithMe' +import SharedWithMe from '../../../src/views/SharedWithMe' import { createStore } from 'vuex-extensions' import DesignSystem from 'owncloud-design-system' @@ -39,19 +39,22 @@ export const store = createStore(Vuex.Store, { modules: { Files: { state: { - resource: null + resource: null, + currentPage: 1 }, getters: { selectedFiles: () => [], activeFiles: () => [createFile({ id: 1 }), createFile({ id: 2, status: 2 })], activeFilesCount: () => ({ files: 0, folders: 1 }), inProgress: () => [null], - highlightedFile: () => null + highlightedFile: () => null, + paginationLength: () => 3 }, mutations: { UPDATE_RESOURCE: (state, resource) => { state.resource = resource - } + }, + UPDATE_CURRENT_PAGE: () => {} }, namespaced: true } @@ -73,7 +76,7 @@ export const wrapper = mount( } ) -jest.mock('../../src/helpers/resources', () => ({ +jest.mock('../../../src/helpers/resources', () => ({ buildSharedResource: jest.fn(share => share) })) diff --git a/packages/web-app-files/tests/views/SharedWithMe.spec.js b/packages/web-app-files/tests/unit/views/SharedWithMe.spec.js similarity index 100% rename from packages/web-app-files/tests/views/SharedWithMe.spec.js rename to packages/web-app-files/tests/unit/views/SharedWithMe.spec.js diff --git a/packages/web-pkg/tests/utils/object.spec.js b/packages/web-pkg/tests/unit/utils/object.spec.js similarity index 100% rename from packages/web-pkg/tests/utils/object.spec.js rename to packages/web-pkg/tests/unit/utils/object.spec.js diff --git a/packages/web-runtime/tests/components/Notification.spec.js b/packages/web-runtime/tests/unit/components/Notification.spec.js similarity index 99% rename from packages/web-runtime/tests/components/Notification.spec.js rename to packages/web-runtime/tests/unit/components/Notification.spec.js index be6ea6750b8..a4d111cf5c5 100644 --- a/packages/web-runtime/tests/components/Notification.spec.js +++ b/packages/web-runtime/tests/unit/components/Notification.spec.js @@ -1,7 +1,7 @@ import { config, createLocalVue, mount, shallowMount } from '@vue/test-utils' import { Store } from 'vuex-mock-store' import Notifications from 'web-runtime/src/components/Notifications.vue' -import stubs from '../../../../tests/unit/stubs' +import stubs from '../../../../../tests/unit/stubs' import DesignSystem from 'owncloud-design-system' const localVue = createLocalVue() localVue.use(DesignSystem) diff --git a/packages/web-runtime/tests/components/TopBar.spec.js b/packages/web-runtime/tests/unit/components/TopBar.spec.js similarity index 97% rename from packages/web-runtime/tests/components/TopBar.spec.js rename to packages/web-runtime/tests/unit/components/TopBar.spec.js index 0f00112361a..01ad125d923 100644 --- a/packages/web-runtime/tests/components/TopBar.spec.js +++ b/packages/web-runtime/tests/unit/components/TopBar.spec.js @@ -1,8 +1,8 @@ import { shallowMount, createLocalVue } from '@vue/test-utils' import Vuex from 'vuex' import TopBar from 'web-runtime/src/components/TopBar.vue' -import stubs from '../../../../tests/unit/stubs' -import axe from '../../../../tests/unit/helper/axe' +import stubs from '../../../../../tests/unit/stubs' +import axe from '../../../../../tests/unit/helper/axe' const localVue = createLocalVue() localVue.use(Vuex) diff --git a/packages/web-runtime/tests/components/UserMenu.spec.js b/packages/web-runtime/tests/unit/components/UserMenu.spec.js similarity index 97% rename from packages/web-runtime/tests/components/UserMenu.spec.js rename to packages/web-runtime/tests/unit/components/UserMenu.spec.js index 149807b3ff9..309da2ec17f 100644 --- a/packages/web-runtime/tests/components/UserMenu.spec.js +++ b/packages/web-runtime/tests/unit/components/UserMenu.spec.js @@ -2,7 +2,7 @@ import { shallowMount, createLocalVue, mount } from '@vue/test-utils' import Vuex from 'vuex' import { Store } from 'vuex-mock-store' import UserMenu from 'web-runtime/src/components/UserMenu.vue' -import stubs from '../../../../tests/unit/stubs' +import stubs from '../../../../../tests/unit/stubs' import DesignSystem from 'owncloud-design-system' const localVue = createLocalVue() diff --git a/packages/web-runtime/tests/components/__snapshots__/TopBar.spec.js.snap b/packages/web-runtime/tests/unit/components/__snapshots__/TopBar.spec.js.snap similarity index 100% rename from packages/web-runtime/tests/components/__snapshots__/TopBar.spec.js.snap rename to packages/web-runtime/tests/unit/components/__snapshots__/TopBar.spec.js.snap diff --git a/packages/web-runtime/tests/helpers/config.spec.js b/packages/web-runtime/tests/unit/helpers/config.spec.js similarity index 100% rename from packages/web-runtime/tests/helpers/config.spec.js rename to packages/web-runtime/tests/unit/helpers/config.spec.js diff --git a/packages/web-runtime/tests/helpers/theme.spec.js b/packages/web-runtime/tests/unit/helpers/theme.spec.js similarity index 100% rename from packages/web-runtime/tests/helpers/theme.spec.js rename to packages/web-runtime/tests/unit/helpers/theme.spec.js diff --git a/packages/web-runtime/tests/mixins/focusMixin.spec.js b/packages/web-runtime/tests/unit/mixins/focusMixin.spec.js similarity index 98% rename from packages/web-runtime/tests/mixins/focusMixin.spec.js rename to packages/web-runtime/tests/unit/mixins/focusMixin.spec.js index d0e42ba6c3b..6bc6cd0e85c 100644 --- a/packages/web-runtime/tests/mixins/focusMixin.spec.js +++ b/packages/web-runtime/tests/unit/mixins/focusMixin.spec.js @@ -1,5 +1,5 @@ import { createLocalVue, shallowMount } from '@vue/test-utils' -import focusMixin from '../../src/mixins/focusMixin' +import focusMixin from '../../../src/mixins/focusMixin' const localVue = createLocalVue() localVue.mixin(focusMixin) diff --git a/packages/web-runtime/tests/mixins/lifecycleMixin.spec.js b/packages/web-runtime/tests/unit/mixins/lifecycleMixin.spec.js similarity index 95% rename from packages/web-runtime/tests/mixins/lifecycleMixin.spec.js rename to packages/web-runtime/tests/unit/mixins/lifecycleMixin.spec.js index df88ab5f719..cd751a876d5 100644 --- a/packages/web-runtime/tests/mixins/lifecycleMixin.spec.js +++ b/packages/web-runtime/tests/unit/mixins/lifecycleMixin.spec.js @@ -1,5 +1,5 @@ import { createLocalVue, shallowMount } from '@vue/test-utils' -import lifecycleMixin from '../../src/mixins/lifecycleMixin' +import lifecycleMixin from '../../../src/mixins/lifecycleMixin' const localVue = createLocalVue() localVue.mixin(lifecycleMixin) diff --git a/packages/web-runtime/tests/store/config.spec.js b/packages/web-runtime/tests/unit/store/config.spec.js similarity index 84% rename from packages/web-runtime/tests/store/config.spec.js rename to packages/web-runtime/tests/unit/store/config.spec.js index f7aa041b064..09ac09e80f3 100644 --- a/packages/web-runtime/tests/store/config.spec.js +++ b/packages/web-runtime/tests/unit/store/config.spec.js @@ -1,10 +1,18 @@ +import Vue from 'vue' +import Vuex from 'vuex' +import { createStore } from 'vuex-extensions' + import { loadTheme } from 'web-runtime/src/helpers/theme' -import store from 'web-runtime/src/store' +import Store from 'web-runtime/src/store' import { keysDeep } from 'web-pkg/src/utils/object' import get from 'lodash-es/get' import difference from 'lodash-es/difference' describe('config theme bootstrap', () => { + Vue.use(Vuex) + + const store = createStore(Vuex.Store, { ...Store }) + const initialStoreTheme = { ...store.getters.configuration.theme } beforeEach(() => { diff --git a/tests/unit/config/jest.init.js b/tests/unit/config/jest.init.js index fff1680ebf6..0d7923a95c7 100644 --- a/tests/unit/config/jest.init.js +++ b/tests/unit/config/jest.init.js @@ -8,5 +8,11 @@ try { } catch (error) {} config.mocks = { - $gettext: str => str + $gettext: str => str, + $route: { + params: {}, + query: {}, + name: '', + path: '' + } }