Merge pull request #7424 from nextcloud-libraries/chore/import-jest-globals

susnux · web-flow · commit 60523fa16300 · 2025-09-02T10:02:39.000+02:00
chore(test): explicitly import from jest/globals to simplify migration to/from Vitest
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -47,24 +47,6 @@ export default defineConfig([
 		},
 	},
 
-	{
-		name: '@nextcloud/vue/tests-jest',
-		files: ['tests/**/*.{js,ts}', '**/*.spec.{js,ts}', '**/*.test.{js,ts}'],
-		languageOptions: {
-			globals: {
-				describe: 'readonly',
-				it: 'readonly',
-				test: 'readonly',
-				expect: 'readonly',
-				beforeEach: 'readonly',
-				afterEach: 'readonly',
-				beforeAll: 'readonly',
-				afterAll: 'readonly',
-				jest: 'readonly',
-			},
-		},
-	},
-
 	{
 		name: '@nextcloud/vue/tests-cypres',
 		files: ['cypress/**/*.{js,ts}'],
diff --git a/jest.config.js b/jest.config.js
@@ -39,6 +39,9 @@ const ignorePatterns = [
 ]
 
 module.exports = {
+	// Disable globals to simplify migration to Vitest
+	injectGlobals: false,
+
 	moduleFileExtensions: [
 		'js',
 		'ts',
diff --git a/tests/unit/components/NcActions/NcActionButton.spec.ts b/tests/unit/components/NcActions/NcActionButton.spec.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { describe, expect, it } from '@jest/globals'
 import { mount } from '@vue/test-utils'
 import NcActionButton from '../../../../src/components/NcActionButton/NcActionButton.vue'
 
diff --git a/tests/unit/components/NcActions/NcActions.spec.ts b/tests/unit/components/NcActions/NcActions.spec.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { beforeEach, describe, expect, it } from '@jest/globals'
 import { mount } from '@vue/test-utils'
 import { defineComponent } from 'vue'
 import { Fragment } from 'vue-frag'
diff --git a/tests/unit/components/NcAppContent/NcAppContent.spec.ts b/tests/unit/components/NcAppContent/NcAppContent.spec.ts
@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { describe, expect, it } from '@jest/globals'
+import { beforeEach, describe, expect, it } from '@jest/globals'
 import { mount } from '@vue/test-utils'
 import NcAppContent from '../../../../src/components/NcAppContent/NcAppContent.vue'
 
diff --git a/tests/unit/components/NcAppNavigation/NcAppNavigation.spec.js b/tests/unit/components/NcAppNavigation/NcAppNavigation.spec.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { describe, expect, it } from '@jest/globals'
+import { beforeEach, describe, expect, it } from '@jest/globals'
 import { emit } from '@nextcloud/event-bus'
 import { mount } from '@vue/test-utils'
 import { nextTick } from 'vue'
diff --git a/tests/unit/components/NcAppSettingsDialog/NcAppSettingsDialog.spec.ts b/tests/unit/components/NcAppSettingsDialog/NcAppSettingsDialog.spec.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { beforeAll, describe, expect, it, jest } from '@jest/globals'
 import { mount } from '@vue/test-utils'
 import { defineComponent, inject, nextTick, onMounted } from 'vue'
 import NcAppSettingsDialog from '../../../../src/components/NcAppSettingsDialog/NcAppSettingsDialog.vue'
diff --git a/tests/unit/components/NcAppSidebar/NcAppSidebarTabs.spec.js b/tests/unit/components/NcAppSidebar/NcAppSidebarTabs.spec.js
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { afterEach, beforeEach, describe, expect, it, jest } from '@jest/globals'
 import { mount } from '@vue/test-utils'
 import Vue from 'vue'
 import NcActionButton from '../../../../src/components/NcActionButton/NcActionButton.vue'
diff --git a/tests/unit/components/NcAvatar/NcAvatar.spec.ts b/tests/unit/components/NcAvatar/NcAvatar.spec.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { afterAll, beforeAll, describe, expect, it, jest } from '@jest/globals'
 import { mount, shallowMount } from '@vue/test-utils'
 import { nextTick } from 'vue'
 import NcAvatar from '../../../../src/components/NcAvatar/NcAvatar.vue'
diff --git a/tests/unit/components/NcButton/button.spec.js b/tests/unit/components/NcButton/button.spec.js
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { describe, expect, it, test } from '@jest/globals'
 import { shallowMount } from '@vue/test-utils'
 import NcButton from '../../../../src/components/NcButton/NcButton.vue'
 
diff --git a/tests/unit/components/NcCheckboxRadioSwitch/checkbox.spec.js b/tests/unit/components/NcCheckboxRadioSwitch/checkbox.spec.js
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { describe, expect, it } from '@jest/globals'
 import { mount, shallowMount } from '@vue/test-utils'
 import NcCheckboxRadioSwitch from '../../../../src/components/NcCheckboxRadioSwitch/NcCheckboxRadioSwitch.vue'
 
diff --git a/tests/unit/components/NcDateTime/NcDateTime.spec.js b/tests/unit/components/NcDateTime/NcDateTime.spec.js
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { afterAll, beforeAll, beforeEach, describe, expect, it, jest } from '@jest/globals'
 import * as nextcloudl10n from '@nextcloud/l10n'
 import { mount } from '@vue/test-utils'
 import { nextTick } from 'vue'
diff --git a/tests/unit/components/NcHighlight/NcHighlight.spec.js b/tests/unit/components/NcHighlight/NcHighlight.spec.js
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { describe, expect, it } from '@jest/globals'
 import { mount } from '@vue/test-utils'
 import NcHighlight from '../../../../src/components/NcHighlight/NcHighlight.vue'
 
diff --git a/tests/unit/components/NcIconSvgWrapper/NcIconSvgWrapper.spec.js b/tests/unit/components/NcIconSvgWrapper/NcIconSvgWrapper.spec.js
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { describe, expect, it } from '@jest/globals'
 import { shallowMount } from '@vue/test-utils'
 import NcIconSvgWrapper from '../../../../src/components/NcIconSvgWrapper/index.js'
 
diff --git a/tests/unit/components/NcInputField/NcInputField.spec.ts b/tests/unit/components/NcInputField/NcInputField.spec.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { describe, expect, it } from '@jest/globals'
 import { shallowMount } from '@vue/test-utils'
 import NcInputField from '../../../../src/components/NcInputField/index.js'
 
diff --git a/tests/unit/components/NcListItemIcon/list-item-icon.spec.ts b/tests/unit/components/NcListItemIcon/list-item-icon.spec.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { describe, expect, it } from '@jest/globals'
 import { shallowMount } from '@vue/test-utils'
 import NcListItemIcon from '../../../../src/components/NcListItemIcon/NcListItemIcon.vue'
 
diff --git a/tests/unit/components/NcModal/modal.spec.js b/tests/unit/components/NcModal/modal.spec.js
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { describe, expect, it } from '@jest/globals'
 import { mount } from '@vue/test-utils'
 import NcModal from '../../../../src/components/NcModal/NcModal.vue'
 
diff --git a/tests/unit/components/NcRichContenteditable/NcRichContenteditable.spec.ts b/tests/unit/components/NcRichContenteditable/NcRichContenteditable.spec.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { describe, expect, it, jest } from '@jest/globals'
 import { mount } from '@vue/test-utils'
 import Tribute from 'tributejs/dist/tribute.esm.js'
 import NcRichContenteditable from '../../../../src/components/NcRichContenteditable/NcRichContenteditable.vue'
diff --git a/tests/unit/components/NcRichText/NcRichText.spec.js b/tests/unit/components/NcRichText/NcRichText.spec.js
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { describe, expect, it, test } from '@jest/globals'
 import { mount } from '@vue/test-utils'
 import { nextTick } from 'vue'
 import NcRichText from '../../../../src/components/NcRichText/NcRichText.vue'
diff --git a/tests/unit/components/NcRichText/autoLink.spec.js b/tests/unit/components/NcRichText/autoLink.spec.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { beforeAll, describe, it, jest } from '@jest/globals'
+import { beforeAll, describe, expect, it, jest } from '@jest/globals'
 import { getBaseUrl, getRootUrl } from '@nextcloud/router'
 import Vue from 'vue'
 import VueRouter from 'vue-router'
diff --git a/tests/unit/components/NcRichText/helpers.spec.js b/tests/unit/components/NcRichText/helpers.spec.js
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { describe, expect, it } from '@jest/globals'
 import { URL_PATTERN, URL_PATTERN_AUTOLINK } from '../../../../src/components/NcRichText/helpers.js'
 
 describe('URL_PATTERN', () => {
diff --git a/tests/unit/composables/useFormatDateTime.spec.js b/tests/unit/composables/useFormatDateTime.spec.js
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { afterAll, beforeAll, beforeEach, describe, expect, it, jest } from '@jest/globals'
 import Vue, { computed, isRef, nextTick, ref } from 'vue'
 import { useFormatDateTime, useFormatRelativeTime } from '../../../src/composables/useFormatDateTime/index.ts'
 
diff --git a/tests/unit/composables/useHotKey.spec.js b/tests/unit/composables/useHotKey.spec.js
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { afterEach, describe, expect, it, jest } from '@jest/globals'
 import { useHotKey } from '../../../src/composables/useHotKey/index.ts'
 
 describe('useHotKey', () => {
diff --git a/tests/unit/composables/useIsMobile.spec.js b/tests/unit/composables/useIsMobile.spec.js
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { describe, expect, it } from '@jest/globals'
 import { mount } from '@vue/test-utils'
 import { isRef, nextTick } from 'vue'
 import { useIsMobile } from '../../../src/composables/useIsMobile/index.js'
diff --git a/tests/unit/functions/usernameToColor/usernameToColor.spec.js b/tests/unit/functions/usernameToColor/usernameToColor.spec.js
@@ -2,6 +2,7 @@
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+import { describe, expect, it } from '@jest/globals'
 import usernameToColor from '../../../../src/functions/usernameToColor/index.js'
 
 function rgbToHex(color) {
diff --git a/tests/unit/mixins/richEditor.spec.js b/tests/unit/mixins/richEditor.spec.js
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { describe, expect, it } from '@jest/globals'
 import { shallowMount } from '@vue/test-utils'
 import richEditor from '../../../src/mixins/richEditor/index.js'
 
diff --git a/tests/unit/testing-utils.ts b/tests/unit/testing-utils.ts
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { jest } from '@jest/globals'
 import { nextTick } from 'vue'
 
 /**
diff --git a/tests/unit/utils/FindRanges.spec.js b/tests/unit/utils/FindRanges.spec.js
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { describe, expect, it } from '@jest/globals'
 import FindRanges from '../../../src/utils/FindRanges.js'
 
 describe('FindRanges.js', () => {
diff --git a/tests/unit/utils/createElementId.spec.ts b/tests/unit/utils/createElementId.spec.ts
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { beforeEach, describe, expect, jest, test } from '@jest/globals'
+
 describe('createElementId', () => {
 	beforeEach(() => {
 		delete window._nc_vue_element_id
diff --git a/tests/unit/utils/getAvatarUrl.spec.ts b/tests/unit/utils/getAvatarUrl.spec.ts
@@ -2,6 +2,7 @@
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+import { afterEach, describe, expect, it } from '@jest/globals'
 import { getAvatarUrl } from '../../../src/utils/getAvatarUrl.ts'
 
 describe('getAvatarUrl', () => {

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ const ignorePatterns = [`
`39`	`39`	`]`
`40`	`40`
`41`	`41`	`module.exports = {`
	`42`	`+ // Disable globals to simplify migration to Vitest`
	`43`	`+ injectGlobals: false,`
	`44`	`+`
`42`	`45`	`moduleFileExtensions: [`
`43`	`46`	`'js',`
`44`	`47`	`'ts',`