fix: moved the default testMatch setting to the generator to allow ov…

…errides in either package.json or jest.config.js to function properly

- ninja edit: somehow tests passed even though I used the wrong jest config option in the generator

packages/@vue/cli-plugin-unit-jest/__tests__/jestPlugin.spec.js

@@ -13,7 +13,7 @@ test('should work', async () => {
 })
 
 test('should respect jest testMatch config', async () => {
-  const project = await create('unit-jest', {
+  const project = await create('unit-jest-package.json', {
     plugins: {
       '@vue/cli-plugin-babel': {},
       '@vue/cli-plugin-unit-jest': {}
@@ -30,6 +30,30 @@ test('should respect jest testMatch config', async () => {
   } catch (e) {
     result = e
   }
-  console.log(result)
-  expect(result.stdout).toMatch('custom-test-directory/my.spec.js')
+  expect(result.stdout).toMatch('testMatch: custom-test-directory/my.spec.js')
+  expect(result.stdout).toMatch('No tests found')
+})
+
+test('should respect jest.config.js testMatch config', async () => {
+  const project = await create('unit-jest-jest.config.js', {
+    plugins: {
+      '@vue/cli-plugin-babel': {},
+      '@vue/cli-plugin-unit-jest': {}
+    },
+    useConfigFiles: true
+  })
+  await project.write('jest.config.js', `
+  module.exports = ${JSON.stringify({
+    testMatch: ['custom-test-directory/my.spec.js']
+  })}
+  `)
+
+  let result
+  try {
+    await project.run(`vue-cli-service test`)
+  } catch (e) {
+    result = e
+  }
+  expect(result.stdout).toMatch('testMatch: custom-test-directory/my.spec.js')
+  expect(result.stdout).toMatch('No tests found')
 })

packages/@vue/cli-plugin-unit-jest/generator/index.js

@@ -28,6 +28,9 @@ module.exports = api => {
     // serializer for snapshots
     'snapshotSerializers': [
       'jest-serializer-vue'
+    ],
+    'testMatch': [
+      '<rootDir>/(tests/unit/**/*.spec.(ts|tsx|js)|**/__tests__/*.(ts|tsx|js))'
     ]
   }
 

packages/@vue/cli-plugin-unit-jest/index.js

@@ -17,18 +17,8 @@ module.exports = api => {
     const execa = require('execa')
     const jestBinPath = require.resolve('jest/bin/jest')
 
-    let testMatch = []
-    if (!args._.length && !api.service.pkg.jest.testMatch) {
-      testMatch = [`--testMatch`, `<rootDir>/(tests/unit/**/*.spec.(ts|tsx|js)|**/__tests__/*.(ts|tsx|js))`]
-    }
-
-    const argv = [
-      ...rawArgv,
-      ...testMatch
-    ]
-
     return new Promise((resolve, reject) => {
-      const child = execa(jestBinPath, argv, {
+      const child = execa(jestBinPath, rawArgv, {
         cwd: api.resolve('.'),
         stdio: 'inherit'
       })