From ebf20c38ba1ea08e7866d8c4083be34c6ccabb78 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Mon, 9 Mar 2020 09:46:31 +0100 Subject: [PATCH 1/4] cli: forward test coverage flag --- packages/cli/src/commands/plugin/test.ts | 3 +++ packages/cli/src/index.ts | 1 + 2 files changed, 4 insertions(+) diff --git a/packages/cli/src/commands/plugin/test.ts b/packages/cli/src/commands/plugin/test.ts index e0433abb24..24fa502c10 100644 --- a/packages/cli/src/commands/plugin/test.ts +++ b/packages/cli/src/commands/plugin/test.ts @@ -8,6 +8,9 @@ export default async (cmd: Command) => { if (cmd.watch) { args.push('--watch'); } + if (cmd.coverage) { + args.push('--coverage'); + } try { const result = spawnSync('web-scripts', args, { stdio: 'inherit' }); diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index f8277756d9..bb5eb8f65d 100644 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -41,6 +41,7 @@ const main = (argv: string[]) => { program .command('plugin:test') .option('--watch', 'Enable watch mode') + .option('--coverage', 'Report test coverage') .description('Run all tests for a plugin') .action(pluginTest); From e61dd46ceb3e5d9c80c1b49615877a36df79137d Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Mon, 9 Mar 2020 09:56:45 +0100 Subject: [PATCH 2/4] package: run test and lint without stream or parallel --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b8bc51f039..7df61e65f0 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,9 @@ "scripts": { "start": "yarn build && yarn workspace @spotify-backstage/app start", "build": "lerna run build", - "test": "cross-env CI=true lerna run test --stream --parallel -- --coverage", + "test": "cross-env CI=true lerna run test -- --coverage", "create-plugin": "backstage-cli create-plugin", - "lint": "lerna run lint --stream" + "lint": "lerna run lint" }, "workspaces": { "packages": [ From 4127cdbed36bcc063534095bf27e610af86e64c7 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Mon, 9 Mar 2020 09:57:03 +0100 Subject: [PATCH 3/4] cli: fix regex in createPlugin tests --- packages/cli/src/commands/createPlugin.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/commands/createPlugin.test.ts b/packages/cli/src/commands/createPlugin.test.ts index a7d6a6c78a..609c5d666b 100644 --- a/packages/cli/src/commands/createPlugin.test.ts +++ b/packages/cli/src/commands/createPlugin.test.ts @@ -97,7 +97,7 @@ describe('createPlugin', () => { createTemporaryPluginFolder(tempDir); movePlugin(tempDir, pluginDir, id); expect(fs.existsSync(pluginDir)).toBe(true); - expect(pluginDir).toMatch(`/packages\/plugins\/${id}`); + expect(pluginDir).toMatch(`/plugins\/${id}`); } finally { del.sync(tempDir, { force: true }); del.sync(rootDir, { force: true }); From d45d072120ca032754d4544ccb76308a6b26b7cf Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Mon, 9 Mar 2020 09:57:51 +0100 Subject: [PATCH 4/4] cli/commands/test: rename to testCommand to avoid jest picking it up --- packages/cli/src/commands/plugin/{test.ts => testCommand.ts} | 0 packages/cli/src/index.ts | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/cli/src/commands/plugin/{test.ts => testCommand.ts} (100%) diff --git a/packages/cli/src/commands/plugin/test.ts b/packages/cli/src/commands/plugin/testCommand.ts similarity index 100% rename from packages/cli/src/commands/plugin/test.ts rename to packages/cli/src/commands/plugin/testCommand.ts diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index bb5eb8f65d..61fa36d2af 100644 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -6,7 +6,7 @@ import watch from './commands/watch-deps'; import pluginBuild from './commands/plugin/build'; import pluginLint from './commands/plugin/lint'; import pluginServe from './commands/plugin/serve'; -import pluginTest from './commands/plugin/test'; +import pluginTest from './commands/plugin/testCommand'; process.on('unhandledRejection', err => { throw err;