IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

grafana/toolkit: update the way config is being passed to jest cli (#18115)

Browse Source
This commit is contained in:
Dominik Prokop
2019-07-15 16:57:37 +02:00
committed by GitHub
parent 88d9a3b440
commit 29c89de140
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/grafana-toolkit/src/cli/tasks/plugin/tests.ts
View File

@@ -10,10 +10,15 @@ export interface PluginTestOptions {
export const testPlugin = useSpinner<PluginTestOptions>('Running tests', async ({ updateSnapshot, coverage }) => {
const testConfig = jestConfig();
testConfig.updateSnapshot = updateSnapshot;
testConfig.coverage = coverage;
const cliConfig = {
config: JSON.stringify(testConfig),
updateSnapshot,
coverage,
passWithNoTests: true,
};
const results = await jestCLI.runCLI(testConfig as any, [process.cwd()]);
// @ts-ignore
const results = await jestCLI.runCLI(cliConfig, [process.cwd()]);
if (results.results.numFailedTests > 0 || results.results.numFailedTestSuites > 0) {
throw new Error('Tests failed');

16
packages/grafana-toolkit/src/config/jest.plugin.config.ts
View File

@@ -1,7 +1,7 @@
import path = require('path');
import fs = require('fs');
const whitelistedJestConfigOverrides = ['snapshotSerializers'];
const whitelistedJestConfigOverrides = ['snapshotSerializers', 'moduleNameMapper'];
export const jestConfig = () => {
const jestConfigOverrides = require(path.resolve(process.cwd(), 'package.json')).jest;
@@ -23,17 +23,21 @@ export const jestConfig = () => {
const defaultJestConfig = {
preset: 'ts-jest',
verbose: false,
transform: {
'^.+\\.(ts|tsx)$': 'ts-jest',
},
moduleDirectories: ['node_modules', 'src'],
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
setupFiles,
globals: { 'ts-jest': { isolatedModules: true } },
coverageReporters: ['json-summary', 'text', 'lcov'],
collectCoverageFrom: ['src/**/*.{ts,tsx}', '!**/node_modules/**', '!**/vendor/**'],
updateSnapshot: false,
passWithNoTests: true,
testMatch: [
'<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}',
'<rootDir>/src/**/*.{spec,test,jest}.{js,jsx,ts,tsx}',
],
transformIgnorePatterns: [
'[/\\\\\\\\]node_modules[/\\\\\\\\].+\\\\.(js|jsx|ts|tsx)$',
'^.+\\\\.module\\\\.(css|sass|scss)$',
],
};
return {