From 907d3c963cd92717d4daff4d767d9d7934508883 Mon Sep 17 00:00:00 2001 From: Konrad Wywiol Date: Wed, 17 Oct 2018 14:25:36 +0200 Subject: [PATCH 1/4] added truncate function --- README.md | 3 ++- src/bin/xsolve_wtf.js | 1 + src/src/hooks.js | 9 +++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 56f7ce2..a62961e 100644 --- a/README.md +++ b/README.md @@ -443,7 +443,8 @@ Example config: "proxyCaptureHeaders": true, "proxyCaptureContent": false, "detailedTestLog": false, - "enableScreenshotReports": false, + "enableScreenshotReports": false, + "truncateLogsFileName": false, "extendedPageReadyStateValidation": true, "pollingRate": 100 } diff --git a/src/bin/xsolve_wtf.js b/src/bin/xsolve_wtf.js index 85618d6..faff872 100644 --- a/src/bin/xsolve_wtf.js +++ b/src/bin/xsolve_wtf.js @@ -61,6 +61,7 @@ const configSchema = Joi.object().keys({ proxyCaptureContent: Joi.boolean().required(), detailedTestLog: Joi.boolean().required(), enableScreenshotReports: Joi.boolean().required(), + truncateLogsFileName: Joi.boolean().required(), extendedPageReadyStateValidation: Joi.boolean().required(), pollingRate: Joi.number().integer().required(), user: Joi.object().optional(), diff --git a/src/src/hooks.js b/src/src/hooks.js index 6548720..dda454a 100644 --- a/src/src/hooks.js +++ b/src/src/hooks.js @@ -113,6 +113,8 @@ defineSupportCode(function({After, Before}) { world.logMessage(`Browser logs: "${ JSON.stringify(logs) }"`); }); } + if(config.truncateLogsFileName) + logFileName = truncate(logFileName, 100) saveHar(logFileName, logsDir); return driver.quit(); @@ -134,10 +136,17 @@ defineSupportCode(function({registerHandler}) { let scenarioName = afterStepData.scenario.name; let stepName = afterStepData.name; let screenshotReportFileName = `${ world.getCurrentDate() }__${ featureName }-${ scenarioName }-${ stepName }`; + if(config.truncateLogsFileName) + screenshotReportFileName = truncate(screenshotReportFileName, 100) + world.takeScreenshot(screenshotReportFileName, screenshotReportsDir); }); }); +function truncate(str, n){ + return (str.length > n) ? str.substr(0, n-1) + '...' : str; +}; + function createLogDirs(logsDir, screenshotReportsDir) { if(!fs.existsSync(logsDir)) { fs.mkdirSync(logsDir); From 934a80b9b1fb59f877cc98505dea639d6300bd26 Mon Sep 17 00:00:00 2001 From: Konrad Wywiol Date: Wed, 17 Oct 2018 14:42:01 +0200 Subject: [PATCH 2/4] truncate moved from after to before --- src/src/hooks.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/src/hooks.js b/src/src/hooks.js index dda454a..c8e02db 100644 --- a/src/src/hooks.js +++ b/src/src/hooks.js @@ -96,6 +96,8 @@ defineSupportCode(function({After, Before}) { let featureName = scenario.scenario.feature.name; let scenarioName = scenario.scenario.name; logFileName = `${ world.getCurrentDate() }__${ featureName }-${ scenarioName }`; + if(config.truncateLogsFileName) + logFileName = truncate(logFileName, 100); callback(); }); @@ -113,8 +115,6 @@ defineSupportCode(function({After, Before}) { world.logMessage(`Browser logs: "${ JSON.stringify(logs) }"`); }); } - if(config.truncateLogsFileName) - logFileName = truncate(logFileName, 100) saveHar(logFileName, logsDir); return driver.quit(); @@ -137,7 +137,7 @@ defineSupportCode(function({registerHandler}) { let stepName = afterStepData.name; let screenshotReportFileName = `${ world.getCurrentDate() }__${ featureName }-${ scenarioName }-${ stepName }`; if(config.truncateLogsFileName) - screenshotReportFileName = truncate(screenshotReportFileName, 100) + screenshotReportFileName = truncate(screenshotReportFileName, 100); world.takeScreenshot(screenshotReportFileName, screenshotReportsDir); }); From 61a041b1e7d1796986bbc9c49711f0ab027872ba Mon Sep 17 00:00:00 2001 From: Konrad Wywiol Date: Wed, 17 Oct 2018 14:55:39 +0200 Subject: [PATCH 3/4] changed n-1 to n-3 --- src/src/hooks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src/hooks.js b/src/src/hooks.js index c8e02db..5a73dd6 100644 --- a/src/src/hooks.js +++ b/src/src/hooks.js @@ -144,7 +144,7 @@ defineSupportCode(function({registerHandler}) { }); function truncate(str, n){ - return (str.length > n) ? str.substr(0, n-1) + '...' : str; + return (str.length > n) ? str.substr(0, n-3) + '...' : str; }; function createLogDirs(logsDir, screenshotReportsDir) { From 7ba31b6dc235c81ceb3f6d83b731d6a8234857d7 Mon Sep 17 00:00:00 2001 From: konrad-wywiol Date: Wed, 17 Oct 2018 14:58:05 +0200 Subject: [PATCH 4/4] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a62961e..8163dbc 100644 --- a/README.md +++ b/README.md @@ -443,8 +443,8 @@ Example config: "proxyCaptureHeaders": true, "proxyCaptureContent": false, "detailedTestLog": false, - "enableScreenshotReports": false, - "truncateLogsFileName": false, + "enableScreenshotReports": false, + "truncateLogsFileName": false, "extendedPageReadyStateValidation": true, "pollingRate": 100 }