Skip to content

Commit b57d332

Browse files
author
Shahak Yosef
committed
Merged PR 217002: Refactor tests
Refactor tests
1 parent 978e0d8 commit b57d332

18 files changed

+5930
-6464
lines changed

.eslintignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Task 512388: Fix eslint warnings and errors in tests
2-
test/*
32
/node_modules/*
43
demo/*
54
/**/*.js

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ gulp.task('compile:dts', 'Generate one dts file from modules', function () {
210210
});
211211

212212
gulp.task('compile:spec', 'Compile spec tests', function () {
213-
return gulp.src(['./test/test.spec.ts'])
213+
return gulp.src(['./test/**/*.ts'])
214214
.pipe(webpackStream(webpackTestConfig))
215215
.pipe(gulp.dest('./tmp'));
216216
});

karma.conf.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ module.exports = function (config) {
2626
reporters: argv.debug ? ['spec', 'kjhtml'] : ['spec', 'coverage', 'kjhtml'],
2727
autoWatch: true,
2828
browsers: [browserName],
29+
browserNoActivityTimeout: 300000,
2930
plugins: [
3031
'karma-firefox-launcher',
3132
'karma-chrome-launcher',
@@ -37,7 +38,7 @@ module.exports = function (config) {
3738
],
3839
customLaunchers: {
3940
'Chrome_headless': {
40-
base: 'Chrome',
41+
base: argv.debug ? 'Chrome' : 'ChromeHeadless',
4142
flags: flags.concat("--no-sandbox", "--window-size=800,800"),
4243
},
4344
},

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@
5959
"gulp4-run-sequence": "^1.0.0",
6060
"http-server": "^0.12.1",
6161
"ignore-loader": "^0.1.1",
62-
"jasmine-core": "^2.99.1",
62+
"jasmine-core": "3.10.1",
6363
"jquery": "^3.3.1",
6464
"json-loader": "^0.5.4",
65-
"karma": "^5.2.3",
65+
"karma": "6.3.5",
6666
"karma-chrome-launcher": "^3.1.0",
6767
"karma-coverage": "^2.0.3",
6868
"karma-firefox-launcher": "^1.2.0",
69-
"karma-jasmine": "^0.3.8",
70-
"karma-jasmine-html-reporter": "^0.2.2",
69+
"karma-jasmine": "4.0.1",
70+
"karma-jasmine-html-reporter": "1.7.0",
7171
"karma-phantomjs-launcher": "^1.0.4",
7272
"karma-spec-reporter": "0.0.32",
7373
"moment": "^2.14.1",

0 commit comments

Comments
 (0)