From 8363bea27f77569832c1e8cb6ce81587cbc4a965 Mon Sep 17 00:00:00 2001 From: Fourat ACHOUR Date: Mon, 21 Aug 2017 17:30:07 +0100 Subject: [PATCH 1/5] Deleting hard-code versions --- email_sender/email_sender.js | 8 +++++--- email_sender/file_concat.js | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/email_sender/email_sender.js b/email_sender/email_sender.js index 8710812..28dc0c9 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,14 @@ 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; +prestaVersion = process.env.PRESTAVERSION; + + -var prestaVersion = new Array(); -prestaVersion = [1.6, 1.7]; var transporter = nodeMailer.createTransport({ service: 'Gmail', @@ -25,6 +26,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"))) { diff --git a/email_sender/file_concat.js b/email_sender/file_concat.js index 4cdb699..0538e62 100644 --- a/email_sender/file_concat.js +++ b/email_sender/file_concat.js @@ -1,13 +1,13 @@ var fs = require('fs'); var i = 0; var version = new Array(); -version = [1.6, 1.7]; - +version = process.env.PRESTAVERSION; 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 = ''; @@ -32,6 +32,7 @@ while (i < 2) { } // read content of Js file + jsFile = fs.readFileSync(workSpace + '/test/itg/' + version[i] + '/mochawesome-report/assets/app.js').toString(); // read content of CSS file From afef3199591f3fb83c11fe8a9ea5d84c167f55f5 Mon Sep 17 00:00:00 2001 From: Fourat ACHOUR Date: Mon, 21 Aug 2017 17:38:22 +0100 Subject: [PATCH 2/5] showing type of var --- email_sender/email_sender.js | 2 ++ email_sender/file_concat.js | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/email_sender/email_sender.js b/email_sender/email_sender.js index 28dc0c9..303c4c2 100644 --- a/email_sender/email_sender.js +++ b/email_sender/email_sender.js @@ -15,6 +15,8 @@ var recipientEmail = process.env.RECIPIENT_EMAIL; prestaVersion = process.env.PRESTAVERSION; +console.log('prestasversion'+prestaVersion) + var transporter = nodeMailer.createTransport({ diff --git a/email_sender/file_concat.js b/email_sender/file_concat.js index 0538e62..0db6db8 100644 --- a/email_sender/file_concat.js +++ b/email_sender/file_concat.js @@ -4,6 +4,10 @@ var version = new Array(); version = process.env.PRESTAVERSION; var workSpace = process.env.TRAVIS_BUILD_DIR +console.log(version) + +console.log('version'+version) + while (i < 2) { // Verify the existence of Mocha Reporter From ae882bccdc63a76de4038367d74c5642c15c838d Mon Sep 17 00:00:00 2001 From: Fourat ACHOUR Date: Mon, 21 Aug 2017 17:52:28 +0100 Subject: [PATCH 3/5] get version from ENV VAR --- email_sender/email_sender.js | 2 +- email_sender/file_concat.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/email_sender/email_sender.js b/email_sender/email_sender.js index 303c4c2..338cef6 100644 --- a/email_sender/email_sender.js +++ b/email_sender/email_sender.js @@ -13,7 +13,7 @@ var senderEmail = process.env.SENDER_EMAIL; var senderPassword = process.env.SENDER_PASSWORD; var recipientEmail = process.env.RECIPIENT_EMAIL; prestaVersion = process.env.PRESTAVERSION; - +prestaVersion = prestaVersion.split(","); console.log('prestasversion'+prestaVersion) diff --git a/email_sender/file_concat.js b/email_sender/file_concat.js index 0db6db8..6f340a3 100644 --- a/email_sender/file_concat.js +++ b/email_sender/file_concat.js @@ -2,7 +2,8 @@ var fs = require('fs'); var i = 0; var version = new Array(); version = process.env.PRESTAVERSION; -var workSpace = process.env.TRAVIS_BUILD_DIR +version = version.split(","); +var workSpace = process.env.TRAVIS_BUILD_DIR; console.log(version) @@ -51,7 +52,6 @@ while (i < 2) { } else { i++ } - } From c7a79e6f67f96104fb4e2e91d3c9f08cf513bc7c Mon Sep 17 00:00:00 2001 From: Fourat ACHOUR Date: Tue, 22 Aug 2017 10:34:32 +0100 Subject: [PATCH 4/5] deleting travis text messages --- email_sender/email_sender.js | 4 ---- email_sender/file_concat.js | 4 ---- 2 files changed, 8 deletions(-) diff --git a/email_sender/email_sender.js b/email_sender/email_sender.js index 338cef6..cc134dc 100644 --- a/email_sender/email_sender.js +++ b/email_sender/email_sender.js @@ -15,10 +15,6 @@ var recipientEmail = process.env.RECIPIENT_EMAIL; prestaVersion = process.env.PRESTAVERSION; prestaVersion = prestaVersion.split(","); -console.log('prestasversion'+prestaVersion) - - - var transporter = nodeMailer.createTransport({ service: 'Gmail', auth: { diff --git a/email_sender/file_concat.js b/email_sender/file_concat.js index 6f340a3..e53c274 100644 --- a/email_sender/file_concat.js +++ b/email_sender/file_concat.js @@ -5,10 +5,6 @@ version = process.env.PRESTAVERSION; version = version.split(","); var workSpace = process.env.TRAVIS_BUILD_DIR; -console.log(version) - -console.log('version'+version) - while (i < 2) { // Verify the existence of Mocha Reporter From ce5dd1bac1c8976500bfb1fd67c6cc58d8c66136 Mon Sep 17 00:00:00 2001 From: fouratachour Date: Tue, 22 Aug 2017 17:16:47 +0100 Subject: [PATCH 5/5] deleting spaces --- email_sender/email_sender.js | 3 +-- email_sender/file_concat.js | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/email_sender/email_sender.js b/email_sender/email_sender.js index cc134dc..6b2d3b8 100644 --- a/email_sender/email_sender.js +++ b/email_sender/email_sender.js @@ -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 e53c274..637297a 100644 --- a/email_sender/file_concat.js +++ b/email_sender/file_concat.js @@ -29,7 +29,6 @@ while (i < 2) { console.log("The file was saved!"); }); - } // read content of Js file @@ -48,6 +47,4 @@ while (i < 2) { } else { i++ } -} - - +} \ No newline at end of file