Merge pull request #1128 from nextcloud-libraries/fix/testing-globs

fix(globs): adjust globs for test related files

Author: susnux

lib/globs.ts

@@ -8,8 +8,10 @@ export const GLOB_FILES_TESTING = [
 	'**/*.test.*',
 	'**/*.spec.*',
 	'**/*.cy.*',
-	'**/test',
-	'**/tests',
+	'**/test/**',
+	'**/tests/**',
+	'**/__tests__/**',
+	'**/__mocks__/**',
 ]
 
 /** Glob pattern for Typescript files */

tests/config-codestyle.test.ts

@@ -5,6 +5,8 @@
 import type { Linter } from 'eslint'
 
 import { ESLint } from 'eslint'
+import { existsSync } from 'fs'
+import { readFile } from 'fs/promises'
 import { join, resolve } from 'path'
 import { expect, test } from 'vitest'
 import * as eslintConfig from '../lib/index.js'
@@ -21,9 +23,18 @@ const eslint = new ESLint({
  * @param file - File path to lint
  * @return Lint result
  */
-async function lintFile(file) {
-	const real = resolve(join(__dirname, file))
-	return await eslint.lintFiles(real)
+async function lintTestCase(testCase: string) {
+	let file = `fixtures/codestyle/input/${testCase}.`
+	if (existsSync(join(__dirname, file) + 'js')) {
+		file += 'js'
+	} else {
+		file += 'ts'
+	}
+
+	const path = resolve(join(__dirname, file))
+	const content = await readFile(path)
+	const results = await eslint.lintText(content.toString(), { filePath: `src/${file}` })
+	return { results, path }
 }
 
 test.for([
@@ -37,7 +48,7 @@ test.for([
 	'quotes',
 	'semicolons',
 ])('Code style', async (testCase: string) => {
-	const results = await lintFile(`fixtures/codestyle/input/${testCase}.{t,j}s`)
+	const { results, path } = await lintTestCase(testCase)
 	expect(results).toHaveLength(1)
-	await expect(results[0].output).toMatchFileSnapshot(results[0].filePath.replace('input', 'output'))
+	await expect(results[0].output).toMatchFileSnapshot(path.replace('input', 'output'))
 })

tests/config-javascript.test.ts

@@ -5,7 +5,7 @@
 import type { Linter } from 'eslint'
 
 import { ESLint } from 'eslint'
-import { access, copyFile, rm } from 'fs/promises'
+import { access, copyFile, readFile, rm } from 'fs/promises'
 import { join, resolve } from 'path'
 import { afterAll, beforeAll, describe, expect, test } from 'vitest'
 import * as eslintConfig from '../lib/index.js'
@@ -21,9 +21,10 @@ const eslint = new ESLint({
  * @param file - File path to lint
  * @return Lint result
  */
-async function lintFile(file) {
+async function lintFile(file: string) {
 	const real = resolve(join(__dirname, file))
-	return await eslint.lintFiles(real)
+	const content = await readFile(real)
+	return await eslint.lintText(content.toString(), { filePath: join('src', file) })
 }
 
 test('some basic issues should fail', async () => {

tests/config-typescript.test.ts

@@ -5,6 +5,7 @@
 import type { Linter } from 'eslint'
 
 import { ESLint } from 'eslint'
+import { readFile } from 'fs/promises'
 import { join, resolve } from 'path'
 import { describe, expect, test } from 'vitest'
 import * as eslintConfig from '../lib/index.js'
@@ -17,7 +18,8 @@ const eslint = new ESLint({
 describe('Typescript', () => {
 	async function lintFile(file: string) {
 		const real = resolve(join(__dirname, file))
-		return await eslint.lintFiles(real)
+		const content = await readFile(real)
+		return await eslint.lintText(content.toString(), { filePath: join('src', file) })
 	}
 
 	// Vue files can be both Javascript and Typescript