public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added CSV export of subscribers

Browse source 
Fixed some bugs in subscriptions
Updated some packages to avoid warnings about vulnerabilities
Completed RSS feed campaigns
This commit is contained in:
Tomas Bures 2018-11-17 02:54:23 +01:00
parent 8683f8c91e
commit bf69e633c4
47 changed files with 5255 additions and 9651 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/e2e/README.md
View file

@ -26,7 +26,7 @@ By default e2e tests use `phantomjs`. If you want to use a different browser you
Then adjust your config:
```
[seleniumwebdriver]
[seleniumWebDriver]
browser="firefox"
```

4
test/e2e/install.sh
View file

@ -27,9 +27,9 @@ port=3000
user="mailtrain_test"
password="$MYSQL_PASSWORD"
database="mailtrain_test"
[testserver]
[testServer]
enabled=true
[seleniumwebdriver]
[seleniumWebDriver]
browser="phantomjs"
EOT

12
test/e2e/lib/config.js
View file

@ -4,8 +4,8 @@ const config = require('config');
module.exports = {
app: config,
baseUrl: 'http://localhost:' + config.www.port,
mailUrl: 'http://localhost:' + config.testserver.mailboxserverport,
baseUrl: 'http://localhost:' + config.www.publicPort,
mailUrl: 'http://localhost:' + config.testServer.mailboxServerPort,
users: {
admin: {
username: 'admin',
@ -74,10 +74,10 @@ module.exports = {
'service-url': 'http://localhost:' + config.www.publicPort + '/',
'admin-email': 'keep.admin@mailtrain.org',
'default-homepage': 'https://mailtrain.org',
'smtp-hostname': config.testserver.host,
'smtp-port': config.testserver.port,
'smtp-hostname': config.testServer.host,
'smtp-port': config.testServer.port,
'smtp-encryption': 'NONE',
'smtp-user': config.testserver.username,
'smtp-pass': config.testserver.password
'smtp-user': config.testServer.username,
'smtp-pass': config.testServer.password
}
};

4
test/e2e/lib/exit-unless-test.js
View file

@ -10,8 +10,8 @@ if (process.env.NODE_ENV !== 'test' || !fs.existsSync(path.join(__dirname, '..',
process.exit(1);
}
if (config.app.testserver.enabled !== true) {
log.error('e2e', 'This script only runs if the testserver is enabled. Check config/test.toml');
if (config.app.testServer.enabled !== true) {
log.error('e2e', 'This script only runs if the testServer is enabled. Check config/test.toml');
process.exit(1);
}

4
test/e2e/lib/mocha-e2e.js
View file

@ -10,7 +10,7 @@ const config = require('./config');
const webdriver = require('selenium-webdriver');
const driver = new webdriver.Builder()
.forBrowser(config.app.seleniumwebdriver.browser || 'phantomjs')
.forBrowser(config.app.seleniumWebDriver.browser || 'phantomjs')
.build();
const failHandlerRunning = new WorkerCounter();
@ -96,7 +96,7 @@ function UseCaseReporter(runner) {
const info = `URL: ${currentUrl}`;
await fs.writeFile('last-failed-e2e-test.info', info);
await fs.writeFile('last-failed-e2e-test.html', await driver.getPageSource());
await fs.writeFile('last-failed-e2e-test.png', new Buffer(await driver.takeScreenshot(), 'base64'));
await fs.writeFile('last-failed-e2e-test.png', Buffer.from(await driver.takeScreenshot(), 'base64'));
failHandlerRunning.exit();
})();

2
test/e2e/lib/page.js
View file

@ -104,7 +104,7 @@ module.exports = (...extras) => Object.assign({
async saveScreenshot(destPath) {
const pngData = await driver.takeScreenshot();
const buf = new Buffer(pngData, 'base64');
const buf = Buffer.from(pngData, 'base64');
await fs.writeFile(destPath, buf);
},

12
test/nodeunit/frontmail-test.js
View file

@ -1,12 +0,0 @@
'use strict';
let nodemailer = require('nodemailer');
// This is a dummy test to ensure that nodeunit would not fail on 0 assertions
module.exports['Load nodemailer'] = function (test) {
let transport = nodemailer.createTransport({
streamTransport: true
});
test.ok(transport);
test.done();
};