Skip to content
This repository was archived by the owner on Dec 31, 2019. It is now read-only.

Mochareporter mailing : deleting hard-code #46

Open
fouratachour wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Mochareporter mailing : deleting hard-code #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8363bea
Deleting hard-code versions
Aug 21, 2017
afef319
showing type of var
Aug 21, 2017
ae882bc
get version from ENV VAR
Aug 21, 2017
c7a79e6
deleting travis text messages
Aug 22, 2017
ce5dd1b
deleting spaces
fouratachour Aug 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions email_sender/email_sender.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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');
Expand All @@ -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',
Expand All @@ -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"))) {
Expand Down Expand Up @@ -82,5 +82,4 @@ if ((fs.existsSync("email_sender/test_report_" + prestaVersion[0] + ".html")) &&
]
});
}
console.log("Email successfully sent!")

console.log("Email successfully sent!")
14 changes: 6 additions & 8 deletions email_sender/file_concat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = '';
Expand All @@ -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
Expand All @@ -46,7 +47,4 @@ while (i < 2) {
} else {
i++
}

}


}