Skip to content

Commit

Permalink
upgrading jest to support global setup on multi-projects;
Browse files Browse the repository at this point in the history
jestjs/jest#6865

updating deprecated property

remove tsconfig.jest.json

ignore d.ts files form coverage

This reverts commit 7875345cadaee70b4f2cb2c2d5d3d8554fe0354f.
  • Loading branch information
devaradhanm committed Feb 5, 2019
1 parent d0dc461 commit 685153e
Show file tree
Hide file tree
Showing 11 changed files with 10,612 additions and 11,582 deletions.
15 changes: 0 additions & 15 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,6 @@
"internalConsoleOptions": "neverOpen",
"port": 9229
},
{
"name": "Debug current E2E test file in VSCode",
"type": "node",
"request": "launch",
"runtimeArgs": [
"--inspect-brk",
"${workspaceRoot}/node_modules/jest/bin/jest.js",
"--runInBand",
"--config=${workspaceRoot}/jest.e2e.config.js",
"${relativeFile}"
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"port": 9229
},
{
"name": "Attach debugger to DetailsView in running Chrome instance (must launch Chrome with --remote-debugging-port=9230)",
"type": "chrome",
Expand Down
4 changes: 2 additions & 2 deletions build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- task: Npm@1
inputs:
command: custom
customCommand: run test-in-ci
customCommand: run test -- --ci
displayName: run unit tests

- task: PublishTestResults@2
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
- task: Npm@1
inputs:
command: custom
customCommand: run test-in-ci:e2e
customCommand: run test:e2e -- --ci
displayName: run e2e tests

- task: PublishTestResults@2
Expand Down
13 changes: 1 addition & 12 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
var common = require('./jest.common.config');

module.exports = {
...common,
coverageDirectory: './test-results/unit/coverage',
setupFiles: ['<rootDir>/src/tests/unit/jest-setup.ts'],
moduleFileExtensions: ['ts', 'tsx', 'js'],
roots: ['<rootDir>/src/tests/unit'],
collectCoverage: true,
collectCoverageFrom: ['<rootDir>/src/**/*.{ts,tsx}', '!<rootDir>/src/tests/**'],
coverageReporters: ['json', 'lcov', 'text', 'cobertura'],
testEnvironment: 'jsdom',
reporters: ['default', ['jest-junit', { outputDirectory: '.', outputName: './test-results/unit/junit.xml' }]],
projects: ['<rootDir>/src/tests/unit', '<rootDir>/src/tests/end-to-end'],
};

0 comments on commit 685153e

Please sign in to comment.