azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format error for teamcity log reporter

Browse Source 
- formatError contains source map processing
This commit is contained in:
Ilya Goncharov
2019-09-25 17:49:54 +03:00
parent efe8c2fa7c
commit a5c8882ccb
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt
+15 -13
View File
@@ -102,7 +102,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
return util.format.apply(null, args) + '\n' return util.format.apply(null, args) + '\n'
}; };
const LogReporter = function (baseReporterDecorator) { const LogReporter = function (baseReporterDecorator, formatError) {
const teamcityReporter = require("karma-teamcity-reporter")["reporter:teamcity"][1]; const teamcityReporter = require("karma-teamcity-reporter")["reporter:teamcity"][1];
teamcityReporter.call(this, baseReporterDecorator); teamcityReporter.call(this, baseReporterDecorator);
@@ -139,22 +139,24 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
this.browserResults[browser.id].consoleCollector = [] this.browserResults[browser.id].consoleCollector = []
}; };
const tcSpecFailure = this.specFailure;
this.specFailure = function (browser, result) { this.specFailure = function (browser, result) {
tcSpecFailure.call(this, browser, result);
var log = this.getLog(browser, result); var log = this.getLog(browser, result);
var testName = result.description; var testName = result.description;
const endMessage = log.pop(); log.push(formatMessage(this.TEST_START, testName));
const failedMessage = log.pop();
this.browserResults[browser.id].consoleCollector.forEach(item => { this.browserResults[browser.id].consoleCollector.forEach(item => {
log.push( log.push(
formatMessage(this.TEST_STD_OUT, testName, item) formatMessage(this.TEST_STD_OUT, testName, item)
) )
}); });
log.push(failedMessage);
log.push(endMessage); log.push(formatMessage(this.TEST_FAILED, testName, formatError(
result.log
.map(log => formatError(log))
.join('\n\n')
)));
log.push(formatMessage(this.TEST_END, testName, result.time));
this.browserResults[browser.id].consoleCollector = [] this.browserResults[browser.id].consoleCollector = []
}; };
@@ -168,7 +170,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
} }
}; };
LogReporter.${"$"}inject = ['baseReporterDecorator']; LogReporter.${"$"}inject = ['baseReporterDecorator', 'formatError'];
config.plugins = config.plugins || []; config.plugins = config.plugins || [];
config.plugins.push('karma-*'); // default config.plugins.push('karma-*'); // default