Skip to content

Commit c31d9d9

Browse files
committed
Strip ANSI to make comparisons equivalent
1 parent 98ab729 commit c31d9d9

File tree

3 files changed

+51
-17
lines changed

3 files changed

+51
-17
lines changed

package-lock.json

Lines changed: 39 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
"lint-staged": ">=10",
6464
"maildev": "github:maildev/maildev#v2.0.2",
6565
"mime-types": "^2.1.29",
66+
"strip-ansi": "^7.0.1",
6667
"supertest": "^6.1.3",
6768
"webpack": "^5.28.0",
6869
"xo": "^0.48.0"

test/lib/Cluster.test.js

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import test from 'ava';
22

33
import cluster from 'cluster';
4+
import { default as strip } from 'strip-ansi';
45

56
import Cluster from '../../lib/Cluster.js';
67

@@ -13,7 +14,7 @@ test.beforeEach(t => {
1314
test('prints console log', t => {
1415
console.log = (...args) => {
1516
const msg = Array.from(args).join(' ');
16-
t.is(msg, `${Cluster.workerID()} log item`);
17+
t.is(strip(msg), strip(`${Cluster.workerID()} log item`));
1718
};
1819

1920
Cluster.console.log('log item');
@@ -22,7 +23,7 @@ test('prints console log', t => {
2223
test('prints console warning', t => {
2324
console.warn = (...args) => {
2425
const msg = Array.from(args).join(' ');
25-
t.is(msg, `${Cluster.workerID()} warning item`);
26+
t.is(strip(msg), strip(`${Cluster.workerID()} warning item`));
2627
};
2728

2829
Cluster.console.warn('warning item');
@@ -31,30 +32,30 @@ test('prints console warning', t => {
3132
test('prints console error', t => {
3233
console.error = (...args) => {
3334
const msg = Array.from(args).join(' ');
34-
t.is(msg, `${Cluster.workerID()} error item`);
35+
t.is(strip(msg), strip(`${Cluster.workerID()} error item`));
3536
};
3637

3738
Cluster.console.error('error item');
3839
});
3940

4041
test('prints access log', t => {
4142
const date = new Date().toISOString();
42-
t.is(Cluster.logger({
43+
t.is(strip(Cluster.logger({
4344
date: () => date,
4445
method: () => 'GET',
4546
url: () => '/',
4647
status: () => 304,
4748
'response-time': () => 5.767
48-
}, {}, {}), `${Cluster.workerID()} [${date}] GET / 304 5.767 ms`);
49+
}, {}, {})), strip(`${Cluster.workerID()} [${date}] GET / 304 5.767 ms`));
4950
});
5051

5152
test('prints correct worker ID', t => {
52-
t.is(Cluster.workerID(), `[W${cluster.worker ? cluster.worker.id : 0}/${process.pid}]`);
53+
t.is(strip(Cluster.workerID()), strip(`[W${cluster.worker ? cluster.worker.id : 0}/${process.pid}]`));
5354
});
5455

5556
test('prints wakeup message', t => {
5657
console.log = msg => {
57-
t.is(msg, `Worker ${cluster.worker ? cluster.worker.id : 0} (${process.pid}) now listening on port 4000`);
58+
t.is(strip(msg), strip(`Worker ${cluster.worker ? cluster.worker.id : 0} (${process.pid}) now listening on port 4000`));
5859
};
5960

6061
Cluster.listening(4000);
@@ -63,7 +64,7 @@ test('prints wakeup message', t => {
6364
test.serial('prints group header', t => {
6465
console.log = (...args) => {
6566
const msg = Array.from(args).join(' ');
66-
t.is(msg, `${Cluster.workerID()} Group`);
67+
t.is(strip(msg), strip(`${Cluster.workerID()} Group`));
6768
};
6869

6970
Cluster.console.group('Group');
@@ -72,7 +73,7 @@ test.serial('prints group header', t => {
7273
test.serial('prints indented log item in group', t => {
7374
console.log = (...args) => {
7475
const msg = Array.from(args).join(' ');
75-
t.is(msg, `${Cluster.workerID()} Grouped item`);
76+
t.is(strip(msg), strip(`${Cluster.workerID()} Grouped item`));
7677
};
7778

7879
Cluster.console.log('Grouped item');
@@ -81,7 +82,7 @@ test.serial('prints indented log item in group', t => {
8182
test.serial('prints non-indented group item after group', t => {
8283
console.log = (...args) => {
8384
const msg = Array.from(args).join(' ');
84-
t.is(msg, `${Cluster.workerID()} Ungrouped item`);
85+
t.is(strip(msg), strip(`${Cluster.workerID()} Ungrouped item`));
8586
};
8687

8788
Cluster.console.groupEnd();

0 commit comments

Comments
 (0)