Skip to content

Commit f57f750

Browse files
committed
fix types
1 parent 1f9f331 commit f57f750

File tree

6 files changed

+35
-40
lines changed

6 files changed

+35
-40
lines changed

angular.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
"polyfills": "apps/example-app-karma/src/polyfills.ts",
111111
"tsConfig": "apps/example-app-karma/tsconfig.app.json",
112112
"assets": ["apps/example-app-karma/src/favicon.ico", "apps/example-app-karma/src/assets"],
113-
"styles": ["apps/example-app-karma/src/styles.css"],
113+
"styles": [],
114114
"scripts": [],
115115
"vendorChunk": true,
116116
"extractLicenses": false,

apps/example-app-karma/karma.conf.js

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,38 @@
11
// Karma configuration file, see link for more information
22
// https://karma-runner.github.io/1.0/config/configuration-file.html
33
module.exports = function (config) {
4-
config.set({
5-
basePath: '',
6-
frameworks: ['jasmine', '@angular-devkit/build-angular'],
7-
plugins: [
8-
require('karma-jasmine'),
9-
require('karma-chrome-launcher'),
10-
require('@angular-devkit/build-angular/plugins/karma'),
11-
],
12-
client: {
13-
jasmine: {
14-
// you can add configuration options for Jasmine here
15-
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
16-
// for example, you can disable the random execution with `random: false`
17-
// or set a specific seed with `seed: 4321`
4+
try {
5+
config.set({
6+
basePath: '',
7+
frameworks: ['jasmine', '@angular-devkit/build-angular'],
8+
plugins: [
9+
require('karma-jasmine'),
10+
require('karma-chrome-launcher'),
11+
require('@angular-devkit/build-angular/plugins/karma'),
12+
],
13+
client: {
14+
jasmine: {
15+
// you can add configuration options for Jasmine here
16+
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
17+
// for example, you can disable the random execution with `random: false`
18+
// or set a specific seed with `seed: 4321`
19+
},
20+
clearContext: false, // leave Jasmine Spec Runner output visible in browser
1821
},
19-
clearContext: false, // leave Jasmine Spec Runner output visible in browser
20-
},
21-
jasmineHtmlReporter: {
22-
suppressAll: true, // removes the duplicated traces
23-
},
24-
reporters: ['progress'],
25-
port: 9876,
26-
colors: true,
27-
logLevel: config.LOG_INFO,
28-
autoWatch: true,
29-
browsers: ['Chrome'],
30-
singleRun: false,
31-
restartOnFileChange: true,
32-
});
22+
jasmineHtmlReporter: {
23+
suppressAll: true, // removes the duplicated traces
24+
},
25+
reporters: ['progress'],
26+
port: 9876,
27+
colors: true,
28+
logLevel: config.LOG_INFO,
29+
autoWatch: true,
30+
browsers: ['Chrome'],
31+
singleRun: false,
32+
restartOnFileChange: true,
33+
});
34+
} catch (err) {
35+
console.log(err);
36+
throw err;
37+
}
3338
};

apps/example-app-karma/src/styles.css

Whitespace-only changes.

apps/example-app-karma/tsconfig.editor.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

apps/example-app-karma/tsconfig.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
},
1515
{
1616
"path": "./tsconfig.spec.json"
17-
},
18-
{
19-
"path": "./tsconfig.editor.json"
2017
}
2118
]
2219
}

projects/testing-library/src/lib/testing-library.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export async function render<SutType, WrapperType = SutType>(
5959
providers = [],
6060
schemas = [],
6161
queries,
62-
template,
62+
template = undefined,
6363
wrapper = WrapperComponent,
6464
componentProperties = {},
6565
componentProviders = [],

0 commit comments

Comments
 (0)