Skip to content

Commit

Permalink
chore(testing): use karma spec reporter to show karma results instead…
Browse files Browse the repository at this point in the history
… of built in dots (angular#10500)
  • Loading branch information
josephperrott authored and andrewseguin committed Mar 21, 2018
1 parent 69217c4 commit f882243
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 10 deletions.
23 changes: 20 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"highlight.js": "^9.11.0",
"http-rewrite-middleware": "^0.1.6",
"image-diff": "^1.6.3",
"jasmine-core": "^2.8.0",
"jasmine-core": "2.8.0",
"jsonwebtoken": "^7.4.1",
"karma": "^1.7.1",
"karma-browserstack-launcher": "^1.3.0",
Expand All @@ -104,6 +104,7 @@
"karma-firefox-launcher": "^1.0.1",
"karma-jasmine": "^1.1.0",
"karma-sauce-launcher": "^1.2.0",
"karma-spec-reporter": "^0.0.32",
"karma-sourcemap-loader": "^0.3.7",
"madge": "^2.2.0",
"magic-string": "^0.22.4",
Expand Down
20 changes: 14 additions & 6 deletions test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ module.exports = (config) => {
require('karma-chrome-launcher'),
require('karma-firefox-launcher'),
require('karma-sourcemap-loader'),
require('karma-coverage')
require('karma-coverage'),
require('karma-spec-reporter')
],
files: [
{pattern: 'node_modules/core-js/client/core.js', included: true, watched: false},
Expand Down Expand Up @@ -49,7 +50,7 @@ module.exports = (config) => {
'dist/packages/**/*.js': ['sourcemap']
},

reporters: ['dots'],
reporters: ['spec'],
autoWatch: false,

coverageReporter: {
Expand All @@ -58,6 +59,12 @@ module.exports = (config) => {
subdir: '.'
},

specReporter: {
maxLogLines: 1,
suppressSkipped: true,
showSpecTiming: true,
},

sauceLabs: {
testName: 'material2',
startConnect: false,
Expand All @@ -72,14 +79,15 @@ module.exports = (config) => {
project: 'material2',
startTunnel: false,
retryLimit: 1,
timeout: 600,
timeout: 1800,
pollingTimeout: 20000,
video: false,
},

browserDisconnectTimeout: 20000,
browserNoActivityTimeout: 240000,
captureTimeout: 120000,
browserDisconnectTimeout: 180000,
browserDisconnectTolerance: 3,
browserNoActivityTimeout: 300000,
captureTimeout: 180000,
browsers: ['ChromeHeadlessLocal'],

singleRun: false,
Expand Down

0 comments on commit f882243

Please sign in to comment.