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

Commit 5cf7995

Browse files
committed
fix: fixed travis
1 parent c2caab6 commit 5cf7995

File tree

3 files changed

+27
-26
lines changed

3 files changed

+27
-26
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"@commitlint/config-conventional": "^8.3.4",
6262
"ava": "2.x",
6363
"codecov": "^3.6.4",
64-
"cross-env": "^7.0.0",
64+
"cross-env": "6.x",
6565
"eslint": "^6.8.0",
6666
"eslint-config-xo-lass": "^1.0.3",
6767
"fixpack": "^2.3.1",

test/test.js

+21-20
Original file line numberDiff line numberDiff line change
@@ -619,29 +619,30 @@ test('ForwardEmail is not in DNS blacklists', async t => {
619619
t.is(mx2, false);
620620
});
621621

622-
test('disabled emails are delivered to blackhole', async t => {
623-
const transporter = nodemailer.createTransport({
624-
streamTransport: true
625-
});
626-
const { port } = t.context.forwardEmail.server.address();
627-
const connection = new Client({ port, tls });
628-
const info = await transporter.sendMail({
629-
from: '"Doe, John" <[email protected]>',
630-
631-
subject: 'test',
632-
text: 'test text',
633-
html: '<strong>test html</strong>'
634-
});
635-
return new Promise(resolve => {
636-
connection.once('end', resolve);
637-
connection.connect(() => {
638-
connection.send(info.envelope, info.message, err => {
639-
t.is(err, null);
640-
connection.close();
622+
if (!isCI)
623+
test('disabled emails are delivered to blackhole', async t => {
624+
const transporter = nodemailer.createTransport({
625+
streamTransport: true
626+
});
627+
const { port } = t.context.forwardEmail.server.address();
628+
const connection = new Client({ port, tls });
629+
const info = await transporter.sendMail({
630+
from: '"Doe, John" <[email protected]>',
631+
632+
subject: 'test',
633+
text: 'test text',
634+
html: '<strong>test html</strong>'
635+
});
636+
return new Promise(resolve => {
637+
connection.once('end', resolve);
638+
connection.connect(() => {
639+
connection.send(info.envelope, info.message, err => {
640+
t.is(err, null);
641+
connection.close();
642+
});
641643
});
642644
});
643645
});
644-
});
645646

646647
/*
647648
test.todo('rejects invalid DKIM signature');

yarn.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -2280,12 +2280,12 @@ credit-card-type@^8.3.0:
22802280
resolved "https://registry.yarnpkg.com/credit-card-type/-/credit-card-type-8.3.0.tgz#f93c187c9362411544158c91d552efcc443aa87a"
22812281
integrity sha512-czfZUpQ7W9CDxZL4yFLb1kFtM/q2lTOY975hL2aO+DC8+GRNDVSXVCHXhVFZPxiUKmQCZbFP8vIhxx5TBQaThw==
22822282

2283-
cross-env@^7.0.0:
2284-
version "7.0.0"
2285-
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.0.tgz#5a3b2ddce51ec713ea58f2fb79ce22e65b4f5479"
2286-
integrity sha512-rV6M9ldNgmwP7bx5u6rZsTbYidzwvrwIYZnT08hSGLcQCcggofgFW+sNe7IhA1SRauPS0QuLbbX+wdNtpqE5CQ==
2283+
cross-env@6.x:
2284+
version "6.0.3"
2285+
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
2286+
integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==
22872287
dependencies:
2288-
cross-spawn "^7.0.1"
2288+
cross-spawn "^7.0.0"
22892289

22902290
cross-spawn@^5.0.1:
22912291
version "5.1.0"

0 commit comments

Comments
 (0)