diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000000000000000000000000000000000..7a73a41bfdf76d6f793007240d80983a52f15f97 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,2 @@ +{ +} \ No newline at end of file diff --git a/protractor.conf.js b/protractor.conf.js index a316e678997c7068138c4d785b29d50758ff872c..a624ffb2b8ec330349b6b1a4c5940a1bd2927ad1 100644 --- a/protractor.conf.js +++ b/protractor.conf.js @@ -4,7 +4,7 @@ const path = require('path'); exports.config = { allScriptsTimeout: 11000, - // seleniumAddress: 'http://localhost:4444/wd/hub' + //seleniumAddress: 'http://localhost:4444/wd/hub', // The port to start the selenium server on, or null if the server should // find its own unused port. @@ -30,9 +30,11 @@ exports.config = { framework: 'jasmine', onPrepare: function() { + jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}})); + // Add a screenshot reporter: jasmine.getEnv().addReporter(new HtmlReporter({ - preserveDirectory: false, + preserveDirectory: true, takeScreenShotsOnlyForFailedSpecs: true, screenshotsSubfolder: 'images', jsonsSubfolder: 'jsons', @@ -47,13 +49,14 @@ exports.config = { const day = currentDate.getDate(); const month = currentDate.getMonth() + 1; const year = currentDate.getFullYear(); + const time = currentDate.getHours() + ':' + currentDate.getMinutes() + '-' + currentDate.getSeconds(); const validDescriptions = descriptions.map(function(description) { return description.replace('/', '@'); }); return path.join( - day + '-' + month + '-' + year, + day + '-' + month + '-' + year +'-'+ time, validDescriptions.join('-')); }, }).getJasmine2Reporter()); @@ -64,7 +67,4 @@ exports.config = { defaultTimeoutInterval: 30000, print: function() {}, }, - onPrepare: function() { - jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}})); - }, };