Skip to content

Commit cfdc479

Browse files
darrachequesnedarrachequesne
committed
refactor: use prettier to format test code
1 parent 28d4f03 commit cfdc479

File tree

8 files changed

+195
-148
lines changed

8 files changed

+195
-148
lines changed

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
"test": "npm run format:check && tsc && if test \"$BROWSERS\" = \"1\" ; then npm run test:browser; else npm run test:node; fi",
3636
"test:node": "mocha --reporter dot --bail test/index.js",
3737
"test:browser": "zuul test/index.js --no-coverage",
38-
"format:fix": "prettier --write --parser typescript \"lib/**/*.ts\"",
39-
"format:check": "prettier --check --parser typescript \"lib/**/*.ts\""
38+
"format:fix": "prettier --write --parser typescript 'lib/**/*.ts' 'test/**/*.js'",
39+
"format:check": "prettier --check --parser typescript 'lib/**/*.ts' 'test/**/*.js'"
4040
},
4141
"license": "MIT",
4242
"engines": {

‎test/arraybuffer.js

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,71 @@
1-
const { PacketType, Decoder, Encoder } = require('..');
2-
const expect = require('expect.js');
3-
const helpers = require('./helpers.js');
1+
const { PacketType, Decoder, Encoder } = require("..");
2+
const expect = require("expect.js");
3+
const helpers = require("./helpers.js");
44
const encoder = new Encoder();
55

6-
describe('parser', () => {
7-
it('encodes an ArrayBuffer', done => {
8-
var packet = {
6+
describe("parser", () => {
7+
it("encodes an ArrayBuffer", (done) => {
8+
const packet = {
99
type: PacketType.BINARY_EVENT,
10-
data: ['a', new ArrayBuffer(2)],
10+
data: ["a", new ArrayBuffer(2)],
1111
id: 0,
12-
nsp: '/'
12+
nsp: "/",
1313
};
1414
helpers.test_bin(packet, done);
1515
});
1616

17-
it('encodes a TypedArray', done => {
18-
var array = new Uint8Array(5);
19-
for (var i = 0; i < array.length; i++) array[i] = i;
17+
it("encodes a TypedArray", (done) => {
18+
const array = new Uint8Array(5);
19+
for (let i = 0; i < array.length; i++) array[i] = i;
2020

21-
var packet = {
21+
const packet = {
2222
type: PacketType.BINARY_EVENT,
23-
data: ['a', array],
23+
data: ["a", array],
2424
id: 0,
25-
nsp: '/'
25+
nsp: "/",
2626
};
2727
helpers.test_bin(packet, done);
2828
});
2929

30-
it('encodes ArrayBuffers deep in JSON', done => {
31-
var packet = {
30+
it("encodes ArrayBuffers deep in JSON", (done) => {
31+
const packet = {
3232
type: PacketType.BINARY_EVENT,
33-
data: ['a', {a: 'hi', b: {why: new ArrayBuffer(3)}, c: {a: 'bye', b: { a: new ArrayBuffer(6)}}}],
33+
data: [
34+
"a",
35+
{
36+
a: "hi",
37+
b: { why: new ArrayBuffer(3) },
38+
c: { a: "bye", b: { a: new ArrayBuffer(6) } },
39+
},
40+
],
3441
id: 999,
35-
nsp: '/deep'
42+
nsp: "/deep",
3643
};
3744
helpers.test_bin(packet, done);
3845
});
3946

40-
it('encodes deep binary JSON with null values', done => {
41-
var packet = {
47+
it("encodes deep binary JSON with null values", (done) => {
48+
const packet = {
4249
type: PacketType.BINARY_EVENT,
43-
data: ['a', {a: 'b', c: 4, e: {g: null}, h: new ArrayBuffer(9)}],
44-
nsp: '/',
45-
id: 600
50+
data: ["a", { a: "b", c: 4, e: { g: null }, h: new ArrayBuffer(9) }],
51+
nsp: "/",
52+
id: 600,
4653
};
4754
helpers.test_bin(packet, done);
4855
});
4956

50-
it('cleans itself up on close', () => {
51-
var packet = {
57+
it("cleans itself up on close", () => {
58+
const packet = {
5259
type: PacketType.BINARY_EVENT,
5360
data: [new ArrayBuffer(2), new ArrayBuffer(3)],
5461
id: 0,
55-
nsp: '/'
62+
nsp: "/",
5663
};
5764

5865
const encodedPackets = encoder.encode(packet);
5966

60-
var decoder = new Decoder();
61-
decoder.on('decoded', packet => {
67+
const decoder = new Decoder();
68+
decoder.on("decoded", (packet) => {
6269
throw new Error("received a packet when not all binary data was sent.");
6370
});
6471

‎test/blob.js

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
const { PacketType } = require('..');
2-
const helpers = require('./helpers.js');
1+
const { PacketType } = require("..");
2+
const helpers = require("./helpers.js");
33

4-
const BlobBuilderImpl = typeof BlobBuilder !== 'undefined' ? BlobBuilder :
5-
typeof WebKitBlobBuilder !== 'undefined' ? WebKitBlobBuilder :
6-
typeof MSBlobBuilder !== 'undefined' ? MSBlobBuilder :
7-
typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder : false;
4+
const BlobBuilderImpl =
5+
typeof BlobBuilder !== "undefined"
6+
? BlobBuilder
7+
: typeof WebKitBlobBuilder !== "undefined"
8+
? WebKitBlobBuilder
9+
: typeof MSBlobBuilder !== "undefined"
10+
? MSBlobBuilder
11+
: typeof MozBlobBuilder !== "undefined"
12+
? MozBlobBuilder
13+
: false;
814

9-
describe('parser', () => {
10-
it('encodes a Blob', (done) => {
15+
describe("parser", () => {
16+
it("encodes a Blob", (done) => {
1117
let data;
1218
if (BlobBuilderImpl) {
1319
const bb = new BlobBuilderImpl();
@@ -21,12 +27,12 @@ describe('parser', () => {
2127
type: PacketType.BINARY_EVENT,
2228
data: [data],
2329
id: 0,
24-
nsp: '/'
30+
nsp: "/",
2531
};
2632
helpers.test_bin(packet, done);
2733
});
2834

29-
it('encodes an Blob deep in JSON', (done) => {
35+
it("encodes an Blob deep in JSON", (done) => {
3036
let data;
3137
if (BlobBuilderImpl) {
3238
const bb = new BlobBuilderImpl();
@@ -38,14 +44,14 @@ describe('parser', () => {
3844

3945
const packet = {
4046
type: PacketType.BINARY_EVENT,
41-
data: [{a: 'hi', b: {why: data}, c: 'bye'}],
47+
data: [{ a: "hi", b: { why: data }, c: "bye" }],
4248
id: 999,
43-
nsp: '/deep'
49+
nsp: "/deep",
4450
};
4551
helpers.test_bin(packet, done);
4652
});
4753

48-
it('encodes a binary ack with a blob', (done) => {
54+
it("encodes a binary ack with a blob", (done) => {
4955
let data;
5056
if (BlobBuilderImpl) {
5157
const bb = new BlobBuilderImpl();
@@ -57,11 +63,10 @@ describe('parser', () => {
5763

5864
const packet = {
5965
type: PacketType.BINARY_ACK,
60-
data: [{a: 'hi ack', b: {why: data}, c: 'bye ack'}],
66+
data: [{ a: "hi ack", b: { why: data }, c: "bye ack" }],
6167
id: 999,
62-
nsp: '/deep'
68+
nsp: "/deep",
6369
};
6470
helpers.test_bin(packet, done);
65-
})
66-
71+
});
6772
});

‎test/buffer.js

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
1-
const { PacketType } = require('..');
2-
const helpers = require('./helpers.js');
1+
const { PacketType } = require("..");
2+
const helpers = require("./helpers.js");
33

4-
describe('parser', () => {
5-
it('encodes a Buffer', done => {
6-
helpers.test_bin({
4+
describe("parser", () => {
5+
it("encodes a Buffer", (done) => {
6+
helpers.test_bin(
7+
{
78
type: PacketType.BINARY_EVENT,
8-
data: ['a', Buffer.from('abc', 'utf8')],
9+
data: ["a", Buffer.from("abc", "utf8")],
910
id: 23,
10-
nsp: '/cool'
11-
}, done);
11+
nsp: "/cool",
12+
},
13+
done
14+
);
1215
});
1316

14-
it('encodes a binary ack with Buffer', done => {
15-
helpers.test_bin({
16-
type: PacketType.BINARY_ACK,
17-
data: ['a', Buffer.from('xxx', 'utf8'), {}],
18-
id: 127,
19-
nsp: '/back'
20-
}, done)
17+
it("encodes a binary ack with Buffer", (done) => {
18+
helpers.test_bin(
19+
{
20+
type: PacketType.BINARY_ACK,
21+
data: ["a", Buffer.from("xxx", "utf8"), {}],
22+
id: 127,
23+
nsp: "/back",
24+
},
25+
done
26+
);
2127
});
2228
});

‎test/helpers.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
const parser = require('..');
2-
const expect = require('expect.js');
1+
const parser = require("..");
2+
const expect = require("expect.js");
33
const encoder = new parser.Encoder();
44

55
// tests encoding and decoding a single packet
66
module.exports.test = (obj, done) => {
77
const encodedPackets = encoder.encode(obj);
88

99
const decoder = new parser.Decoder();
10-
decoder.on('decoded', packet => {
10+
decoder.on("decoded", (packet) => {
1111
expect(packet).to.eql(obj);
1212
done();
1313
});
1414

1515
decoder.add(encodedPackets[0]);
16-
}
16+
};
1717

1818
// tests encoding of binary packets
1919
module.exports.test_bin = (obj, done) => {
2020
const originalData = obj.data;
2121
const encodedPackets = encoder.encode(obj);
2222

2323
const decoder = new parser.Decoder();
24-
decoder.on('decoded', packet => {
24+
decoder.on("decoded", (packet) => {
2525
obj.data = originalData;
2626
obj.attachments = undefined;
2727
expect(obj).to.eql(packet);
@@ -31,18 +31,18 @@ module.exports.test_bin = (obj, done) => {
3131
for (let i = 0; i < encodedPackets.length; i++) {
3232
decoder.add(encodedPackets[i]);
3333
}
34-
}
34+
};
3535

3636
// array buffer's slice is native code that is not transported across
3737
// socket.io via msgpack, so regular .eql fails
3838
module.exports.testArrayBuffers = (buf1, buf2) => {
39-
buf1.slice = undefined;
40-
buf2.slice = undefined;
41-
expect(buf1).to.eql(buf2);
42-
}
39+
buf1.slice = undefined;
40+
buf2.slice = undefined;
41+
expect(buf1).to.eql(buf2);
42+
};
4343

4444
module.exports.testPacketMetadata = (p1, p2) => {
4545
expect(p1.type).to.eql(p2.type);
4646
expect(p1.id).to.eql(p2.id);
4747
expect(p1.nsp).to.eql(p2.nsp);
48-
}
48+
};

‎test/index.js

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,41 @@
1-
const env = require('./support/env.js');
1+
const env = require("./support/env.js");
22

33
const blobSupported = (function () {
44
try {
5-
new Blob(['hi']);
5+
new Blob(["hi"]);
66
return true;
7-
} catch (e) {
8-
}
7+
} catch (e) {}
98
return false;
109
})();
1110

1211
/**
1312
* Create a blob builder even when vendor prefixes exist
1413
*/
15-
const BlobBuilderImpl = typeof BlobBuilder !== 'undefined' ? BlobBuilder :
16-
typeof WebKitBlobBuilder !== 'undefined' ? WebKitBlobBuilder :
17-
typeof MSBlobBuilder !== 'undefined' ? MSBlobBuilder :
18-
typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder : false;
19-
const blobBuilderSupported = !!BlobBuilderImpl && !!BlobBuilderImpl.prototype.append && !!BlobBuilderImpl.prototype.getBlob;
14+
const BlobBuilderImpl =
15+
typeof BlobBuilder !== "undefined"
16+
? BlobBuilder
17+
: typeof WebKitBlobBuilder !== "undefined"
18+
? WebKitBlobBuilder
19+
: typeof MSBlobBuilder !== "undefined"
20+
? MSBlobBuilder
21+
: typeof MozBlobBuilder !== "undefined"
22+
? MozBlobBuilder
23+
: false;
24+
const blobBuilderSupported =
25+
!!BlobBuilderImpl &&
26+
!!BlobBuilderImpl.prototype.append &&
27+
!!BlobBuilderImpl.prototype.getBlob;
2028

21-
require('./parser.js');
29+
require("./parser.js");
2230

2331
if (!env.browser) {
24-
require('./buffer.js');
32+
require("./buffer.js");
2533
}
2634

27-
if (typeof ArrayBuffer !== 'undefined') {
28-
require('./arraybuffer.js');
35+
if (typeof ArrayBuffer !== "undefined") {
36+
require("./arraybuffer.js");
2937
}
3038

3139
if (blobSupported || blobBuilderSupported) {
32-
require('./blob.js');
40+
require("./blob.js");
3341
}

0 commit comments

Comments
 (0)