diff --git a/email_sender/email_sender.js b/email_sender/email_sender.js index 8710812..6b2d3b8 100644 --- a/email_sender/email_sender.js +++ b/email_sender/email_sender.js @@ -1,5 +1,4 @@ 'use strict'; - var fs = require('fs'); var optionsBrowser16 = require('../test/itg/1.6/common.webdriverio'); var optionsBrowser17 = require('../test/itg/1.7/common.webdriverio'); @@ -9,12 +8,12 @@ var nodeMailer = require('nodemailer'); var dateFormat = require('dateformat'); // get travis env variable +var prestaVersion = new Array(); var senderEmail = process.env.SENDER_EMAIL; var senderPassword = process.env.SENDER_PASSWORD; var recipientEmail = process.env.RECIPIENT_EMAIL; - -var prestaVersion = new Array(); -prestaVersion = [1.6, 1.7]; +prestaVersion = process.env.PRESTAVERSION; +prestaVersion = prestaVersion.split(","); var transporter = nodeMailer.createTransport({ service: 'Gmail', @@ -25,6 +24,7 @@ var transporter = nodeMailer.createTransport({ }); console.log('Sending Email .....'); + var day = dateFormat("yyyy-mm-dd h:MM:ss"); if ((fs.existsSync("email_sender/test_report_" + prestaVersion[0] + ".html")) && (fs.existsSync("email_sender/test_report_" + prestaVersion[1] + ".html"))) { @@ -82,5 +82,4 @@ if ((fs.existsSync("email_sender/test_report_" + prestaVersion[0] + ".html")) && ] }); } -console.log("Email successfully sent!") - +console.log("Email successfully sent!") \ No newline at end of file diff --git a/email_sender/file_concat.js b/email_sender/file_concat.js index 4cdb699..637297a 100644 --- a/email_sender/file_concat.js +++ b/email_sender/file_concat.js @@ -1,13 +1,14 @@ var fs = require('fs'); var i = 0; var version = new Array(); -version = [1.6, 1.7]; - -var workSpace = process.env.TRAVIS_BUILD_DIR +version = process.env.PRESTAVERSION; +version = version.split(","); +var workSpace = process.env.TRAVIS_BUILD_DIR; while (i < 2) { // Verify the existence of Mocha Reporter + if (fs.existsSync(workSpace + '/test/itg/' + version[i] + '/mochawesome-report')) { var cssFile = ''; var jsFile = ''; @@ -28,10 +29,10 @@ while (i < 2) { console.log("The file was saved!"); }); - } // read content of Js file + jsFile = fs.readFileSync(workSpace + '/test/itg/' + version[i] + '/mochawesome-report/assets/app.js').toString(); // read content of CSS file @@ -46,7 +47,4 @@ while (i < 2) { } else { i++ } - -} - - +} \ No newline at end of file