Merge pull request #78 from Hargne/release/2.7.0

Release 2.7.0 - Proper console.log handling

jest.config.json

@@ -19,5 +19,15 @@
 			"statements": 50
 	  	}
 	},
-	"testResultsProcessor": "./src"
+	"reporters": [
+		"default",
+		["./src", {
+			"pageTitle": "Test Suite Reporter",
+			"outputPath": "testResultsProcessorResult.html",
+			"includeFailureMsg": true,
+			"includeConsoleLog": true,
+			"useCssFile" : true,
+			"sort": "titleAsc"
+		}]
+	]
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jest-html-reporter",
-  "version": "2.6.2",
+  "version": "2.7.0",
   "description": "Jest test results processor for generating a summary in HTML",
   "main": "dist/main",
   "unpkg": "dist/main.min.js",

src/index.js

@@ -26,12 +26,25 @@ function JestHtmlReporter(globalConfig, options) {
 	 */
 	this.jestConfig = globalConfig;
 	this.jestOptions = options;
+	this.consoleLogs = [];
+
+	this.onTestResult = (data, result) => {
+		// Catch console logs per test
+		if (result.console) {
+			this.consoleLogs.push({
+				testFilePath: result.testFilePath,
+				logs: result.console,
+			});
+		}
+	};
 
 	this.onRunComplete = (contexts, testResult) => {
 		// Apply the configuration within jest.config.json to the current config
 		config.setConfigData(this.jestOptions);
 		// Apply the updated config
 		reportGenerator.config = config;
+		// Add the console logs that we've caught
+		reportGenerator.consoleLogs = this.consoleLogs;
 		// Generate Report
 		return reportGenerator.generate({ data: testResult });
 	};

src/reportGenerator.js

@@ -8,6 +8,7 @@ const sorting = require('./sorting');
 class ReportGenerator {
 	constructor(config) {
 		this.config = config;
+		this.consoleLogs = null;
 	}
 
 	/**
@@ -84,7 +85,11 @@ class ReportGenerator {
 	 * @param  {String} stylesheetPath	Optional path to an external stylesheet
 	 * @return {xmlbuilder}
 	 */
-	renderHtmlReport({ data, stylesheet, stylesheetPath }) {
+	renderHtmlReport({
+		data,
+		stylesheet,
+		stylesheetPath,
+	}) {
 		return new Promise((resolve, reject) => {
 			// Make sure that test data was provided
 			if (!data) { return reject(new Error('Test data missing or malformed')); }
@@ -211,18 +216,32 @@ class ReportGenerator {
 				testTr.ele('td', { class: 'result' }, (test.status === 'passed') ? `${test.status} in ${test.duration / 1000}s` : test.status);
 			});
 
-			// Test Suite console.logs
-			if (suite.console && suite.console.length > 0 && (this.config.shouldIncludeConsoleLog())) {
-				// Console Log Container
-				const consoleLogContainer = reportBody.ele('div', { class: 'suite-consolelog' });
-				// Console Log Header
-				consoleLogContainer.ele('div', { class: 'suite-consolelog-header' }, 'Console Log');
-				// Logs
-				suite.console.forEach((log) => {
-					const logElement = consoleLogContainer.ele('div', { class: 'suite-consolelog-item' });
-					logElement.ele('pre', { class: 'suite-consolelog-item-origin' }, stripAnsi(log.origin));
-					logElement.ele('pre', { class: 'suite-consolelog-item-message' }, stripAnsi(log.message));
-				});
+			// All console.logs caught during the test run
+			if (this.consoleLogs && this.consoleLogs.length > 0 && (this.config.shouldIncludeConsoleLog())) {
+				// Filter out the logs for this test file path
+				const filteredConsoleLogs = this.consoleLogs.find(logs => logs.testFilePath === suite.testFilePath);
+				if (filteredConsoleLogs && filteredConsoleLogs.logs.length > 0) {
+					// Console Log Container
+					const consoleLogContainer = reportBody.ele('div', { class: 'suite-consolelog' });
+					// Console Log Header
+					consoleLogContainer.ele('div', { class: 'suite-consolelog-header' }, 'Console Log');
+					// Sort the order by the path
+					const sortedConsoleLogs = filteredConsoleLogs.logs.sort((a, b) => {
+						if (a.origin < b.origin) {
+							return -1;
+						}
+						if (a.origin > b.origin) {
+							return 1;
+						}
+						return 0;
+					});
+					// Apply the logs to the body
+					sortedConsoleLogs.forEach((log) => {
+						const logElement = consoleLogContainer.ele('div', { class: 'suite-consolelog-item' });
+						logElement.ele('pre', { class: 'suite-consolelog-item-origin' }, stripAnsi(log.origin));
+						logElement.ele('pre', { class: 'suite-consolelog-item-message' }, stripAnsi(log.message));
+					});
+				}
 			}
 		});