Skip to content

Commit e75b403

Browse files
Merge branch 'release/v2.0.2'
2 parents 73c1164 + 6785c16 commit e75b403

File tree

5 files changed

+50
-38
lines changed

5 files changed

+50
-38
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ pnpm-debug.log*
2424
### Costom ignored files
2525
/package-lock.json
2626
/.eslintcache
27+
/jest-coverage/

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## [2.0.2](https://github.com/johnnymillergh/typescript-playground/compare/v2.0.1...v2.0.2) (2020-09-01)
2+
3+
4+
### Performance Improvements
5+
6+
* **$Git:** ignore Jest test coverage reports ([7ec2d5e](https://github.com/johnnymillergh/typescript-playground/commit/7ec2d5ef4ef4a19319ce577a2a9b83fd600b9f11))
7+
* **$Jest:** update Jest configuration ([0c52cf7](https://github.com/johnnymillergh/typescript-playground/commit/0c52cf71a4401d7b64fb550a7400a0dffc74aef7))
8+
9+
10+
111
## [2.0.1](https://github.com/johnnymillergh/typescript-playground/compare/v2.0.0...v2.0.1) (2020-09-01)
212

313

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
Here is the highlights of **TypeScript Playground**:
1818

1919
1. Based on the most modern and latest [**Type**Script](https://github.com/microsoft/TypeScript) - [![npm version](https://badge.fury.io/js/typescript.svg)](https://www.npmjs.com/package/typescript)
20-
2. [TSLint](https://palantir.github.io/tslint/rules) support
20+
2. [TypeScript ESLint](https://github.com/typescript-eslint/typescript-eslint#getting-started--installation) support
2121
3. Web browser free. Run code in the console of latest version WebStorm
2222
4. Demonstrate the features of TypeScript:
2323
- Basic types
@@ -26,6 +26,8 @@ Here is the highlights of **TypeScript Playground**:
2626
- Generics
2727
- Enums
2828
- Async and await
29+
5. Travis CI support
30+
6. Jest and code coverage support
2931

3032
## Usage
3133

jest.config.js

100755100644
Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,33 @@ module.exports = {
1111
// The directory where Jest should store its cached dependency information
1212
// cacheDirectory: "C:\\Users\\johnn\\AppData\\Local\\Temp\\jest",
1313

14-
// Automatically clear mock calls and instances between every tests
14+
// Automatically clear mock calls and instances between every test
1515
clearMocks: true,
1616

17-
// Indicates whether the coverage information should be collected while executing the tests
18-
// collectCoverage: false,
17+
// Indicates whether the coverage information should be collected while executing the test
18+
collectCoverage: true,
1919

2020
// An array of glob patterns indicating a set of files for which coverage information should be collected
2121
// collectCoverageFrom: undefined,
2222

2323
// The directory where Jest should output its coverage files
24-
coverageDirectory: 'coverage',
24+
coverageDirectory: 'jest-coverage',
2525

2626
// An array of regexp pattern strings used to skip coverage collection
27-
// coveragePathIgnorePatterns: [
28-
// "\\\\node_modules\\\\"
29-
// ],
27+
coveragePathIgnorePatterns: [
28+
'\\\\node_modules\\\\'
29+
],
3030

3131
// Indicates which provider should be used to instrument code for coverage
3232
coverageProvider: 'v8',
3333

3434
// A list of reporter names that Jest uses when writing coverage reports
35-
// coverageReporters: [
36-
// "json",
37-
// "text",
38-
// "lcov",
39-
// "clover"
40-
// ],
35+
coverageReporters: [
36+
'json',
37+
'text',
38+
'lcov',
39+
'clover'
40+
],
4141

4242
// An object that configures minimum threshold enforcement for coverage results
4343
// coverageThreshold: undefined,
@@ -51,13 +51,13 @@ module.exports = {
5151
// Force coverage collection from ignored files using an array of glob patterns
5252
// forceCoverageMatch: [],
5353

54-
// A path to a module which exports an async function that is triggered once before all tests suites
54+
// A path to a module which exports an async function that is triggered once before all test suites
5555
// globalSetup: undefined,
5656

57-
// A path to a module which exports an async function that is triggered once after all tests suites
57+
// A path to a module which exports an async function that is triggered once after all test suites
5858
// globalTeardown: undefined,
5959

60-
// A set of global variables that need to be available in all tests environments
60+
// A set of global variables that need to be available in all test environments
6161
// globals: {},
6262

6363
// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
@@ -84,84 +84,83 @@ module.exports = {
8484
// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
8585
// modulePathIgnorePatterns: [],
8686

87-
// Activates notifications for tests results
87+
// Activates notifications for test results
8888
// notify: false,
8989

9090
// An enum that specifies notification mode. Requires { notify: true }
9191
// notifyMode: "failure-change",
9292

9393
// A preset that is used as a base for Jest's configuration
94-
preset: 'ts-jest',
94+
// preset: undefined,
9595

9696
// Run tests from one or more projects
9797
// projects: undefined,
9898

9999
// Use this configuration option to add custom reporters to Jest
100100
// reporters: undefined,
101101

102-
// Automatically reset mock state between every tests
102+
// Automatically reset mock state between every test
103103
// resetMocks: false,
104104

105-
// Reset the module registry before running each individual tests
105+
// Reset the module registry before running each individual test
106106
// resetModules: false,
107107

108108
// A path to a custom resolver
109109
// resolver: undefined,
110110

111-
// Automatically restore mock state between every tests
111+
// Automatically restore mock state between every test
112112
// restoreMocks: false,
113113

114114
// The root directory that Jest should scan for tests and modules within
115115
// rootDir: undefined,
116116

117117
// A list of paths to directories that Jest should use to search for files in
118-
roots: [
119-
'<rootDir>/src',
120-
'<rootDir>/tests'
121-
],
118+
// roots: [
119+
// "<rootDir>"
120+
// ],
122121

123-
// Allows you to use a custom runner instead of Jest's default tests runner
122+
// Allows you to use a custom runner instead of Jest's default test runner
124123
// runner: "jest-runner",
125124

126-
// The paths to modules that run some code to configure or set up the testing environment before each tests
125+
// The paths to modules that run some code to configure or set up the testing environment before each test
127126
// setupFiles: [],
128127

129-
// A list of paths to modules that run some code to configure or set up the testing framework before each tests
128+
// A list of paths to modules that run some code to configure or set up the testing framework before each test
130129
// setupFilesAfterEnv: [],
131130

132-
// The number of seconds after which a tests is considered as slow and reported as such in the results.
131+
// The number of seconds after which a test is considered as slow and reported as such in the results.
133132
// slowTestThreshold: 5,
134133

135134
// A list of paths to snapshot serializer modules Jest should use for snapshot testing
136135
// snapshotSerializers: [],
137136

138-
// The tests environment that will be used for testing
137+
// The test environment that will be used for testing
139138
testEnvironment: 'node',
140139

141140
// Options that will be passed to the testEnvironment
142141
// testEnvironmentOptions: {},
143142

144-
// Adds a location field to tests results
143+
// Adds a location field to test results
145144
// testLocationInResults: false,
146145

147-
// The glob patterns Jest uses to detect tests files
146+
// The glob patterns Jest uses to detect test files
148147
testMatch: [
149148
'**/__tests__/**/*.[jt]s?(x)',
150149
'**/?(*.)+(spec|tests).[tj]s?(x)'
151150
],
152151

153-
// An array of regexp pattern strings that are matched against all tests paths, matched tests are skipped
152+
// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
154153
testPathIgnorePatterns: [
155154
'\\\\node_modules\\\\'
156155
],
157156

158-
// The regexp pattern or array of patterns that Jest uses to detect tests files
157+
// The regexp pattern or array of patterns that Jest uses to detect test files
159158
// testRegex: [],
160159

161160
// This option allows the use of a custom results processor
162161
// testResultsProcessor: undefined,
163162

164-
// This option allows use of a custom tests runner
163+
// This option allows use of a custom test runner
165164
// testRunner: "jasmine2",
166165

167166
// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
@@ -184,7 +183,7 @@ module.exports = {
184183
// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
185184
// unmockedModulePathPatterns: undefined,
186185

187-
// Indicates whether each individual tests should be reported during the run
186+
// Indicates whether each individual test should be reported during the run
188187
// verbose: undefined,
189188

190189
// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "typescript-playground",
3-
"version": "2.0.1",
3+
"version": "2.0.2",
44
"description": "TypeScript playground. Learning TypeScript",
55
"license": "Apache-2.0",
66
"keywords": [

0 commit comments

Comments
 (0)