Skip to content

Commit 51fbf3a

Browse files
committed
refactor: modernize codebase
1 parent c4a1715 commit 51fbf3a

File tree

1 file changed

+86
-84
lines changed

1 file changed

+86
-84
lines changed

test/test.js

Lines changed: 86 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
/* global describe, it */
21
'use strict';
32

43
delete require.cache[require.resolve('../')];
5-
var fs = require('fs');
6-
var es = require('event-stream');
7-
var assert = require('power-assert');
8-
var Vinyl = require('vinyl');
9-
var unassert = require('../');
4+
const unassert = require('../');
5+
const fs = require('fs');
6+
const { join } = require('path');
7+
const es = require('event-stream');
8+
const assert = require('assert').strict;
9+
const Vinyl = require('vinyl');
1010

11-
describe('gulp-unassert', function () {
12-
['es2018', 'es2019'].forEach(function (name) {
13-
it(name + ' syntax', function (done) {
14-
var stream = unassert();
15-
var srcStream = new Vinyl({
16-
path: process.cwd() + '/test/fixtures/' + name + '/fixture.js',
11+
describe('gulp-unassert', () => {
12+
['es2018', 'es2019'].forEach((name) => {
13+
it(name + ' syntax', (done) => {
14+
const stream = unassert();
15+
const srcStream = new Vinyl({
16+
path: join(process.cwd(), 'test', 'fixtures', name, 'fixture.js'),
1717
cwd: process.cwd(),
18-
base: process.cwd() + '/test/fixtures/' + name,
19-
contents: fs.createReadStream('test/fixtures/' + name + '/fixture.js')
18+
base: join(process.cwd(), 'test', 'fixtures', name),
19+
contents: fs.createReadStream(join('test', 'fixtures', name, 'fixture.js'))
2020
});
21-
var expectedFile = new Vinyl({
22-
path: process.cwd() + '/test/fixtures/' + name + '/expected.js',
21+
const expectedFile = new Vinyl({
22+
path: join(process.cwd(), 'test', 'fixtures', name, 'expected.js'),
2323
cwd: process.cwd(),
24-
base: process.cwd() + '/test/fixtures/' + name,
25-
contents: fs.readFileSync('test/fixtures/' + name + '/expected.js')
24+
base: join(process.cwd(), 'test', 'fixtures', name),
25+
contents: fs.readFileSync(join('test', 'fixtures', name, 'expected.js'))
2626
});
27-
stream.on('error', function (err) {
27+
stream.on('error', (err) => {
2828
assert(!err.message);
2929
done();
3030
});
31-
stream.on('data', function (newFile) {
31+
stream.on('data', (newFile) => {
3232
assert(newFile);
3333
assert(newFile.contents);
34-
newFile.contents.pipe(es.wait(function (err, data) {
34+
newFile.contents.pipe(es.wait((err, data) => {
3535
assert(!err);
36-
assert.equal(data.toString('utf-8') + '\n', String(expectedFile.contents));
36+
assert.equal(String(data.toString('utf-8')) + '\n', String(expectedFile.contents));
3737
done();
3838
}));
3939
});
@@ -42,25 +42,25 @@ describe('gulp-unassert', function () {
4242
});
4343
});
4444

45-
it('should produce expected file via buffer', function (done) {
46-
var stream = unassert();
47-
var srcFile = new Vinyl({
48-
path: process.cwd() + '/test/fixtures/patterns/fixture.js',
45+
it('should produce expected file via buffer', (done) => {
46+
const stream = unassert();
47+
const srcFile = new Vinyl({
48+
path: join(process.cwd(), 'test', 'fixtures', 'patterns', 'fixture.js'),
4949
cwd: process.cwd(),
50-
base: process.cwd() + '/test/fixtures/patterns',
51-
contents: fs.readFileSync('test/fixtures/patterns/fixture.js')
50+
base: join(process.cwd(), 'test', 'fixtures', 'patterns'),
51+
contents: fs.readFileSync(join('test', 'fixtures', 'patterns', 'fixture.js'))
5252
});
53-
var expectedFile = new Vinyl({
54-
path: process.cwd() + '/test/fixtures/patterns/expected.js',
53+
const expectedFile = new Vinyl({
54+
path: join(process.cwd(), 'test', 'fixtures', 'patterns', 'expected.js'),
5555
cwd: process.cwd(),
56-
base: process.cwd() + '/test/fixtures/patterns',
57-
contents: fs.readFileSync('test/fixtures/patterns/expected.js')
56+
base: join(process.cwd(), 'test', 'fixtures', 'patterns'),
57+
contents: fs.readFileSync(join('test', 'fixtures', 'patterns', 'expected.js'))
5858
});
59-
stream.on('error', function (err) {
59+
stream.on('error', (err) => {
6060
assert(err);
6161
done(err);
6262
});
63-
stream.on('data', function (newFile) {
63+
stream.on('data', (newFile) => {
6464
assert(newFile);
6565
assert(newFile.contents);
6666
assert.equal(String(newFile.contents), String(expectedFile.contents));
@@ -70,28 +70,28 @@ describe('gulp-unassert', function () {
7070
stream.end();
7171
});
7272

73-
it('should produce expected file via stream', function (done) {
74-
var stream = unassert();
75-
var srcStream = new Vinyl({
76-
path: process.cwd() + '/test/fixtures/patterns/fixture.js',
73+
it('should produce expected file via stream', (done) => {
74+
const stream = unassert();
75+
const srcStream = new Vinyl({
76+
path: join(process.cwd(), 'test', 'fixtures', 'patterns', 'fixture.js'),
7777
cwd: process.cwd(),
78-
base: process.cwd() + '/test/fixtures/patterns',
79-
contents: fs.createReadStream('test/fixtures/patterns/fixture.js')
78+
base: join(process.cwd(), 'test', 'fixtures', 'patterns'),
79+
contents: fs.createReadStream(join('test', 'fixtures', 'patterns', 'fixture.js'))
8080
});
81-
var expectedFile = new Vinyl({
82-
path: process.cwd() + '/test/fixtures/patterns/expected.js',
81+
const expectedFile = new Vinyl({
82+
path: join(process.cwd(), 'test', 'fixtures', 'patterns', 'expected.js'),
8383
cwd: process.cwd(),
84-
base: process.cwd() + '/test/fixtures/patterns',
85-
contents: fs.readFileSync('test/fixtures/patterns/expected.js')
84+
base: join(process.cwd(), 'test', 'fixtures', 'patterns'),
85+
contents: fs.readFileSync(join('test', 'fixtures', 'patterns', 'expected.js'))
8686
});
87-
stream.on('error', function (err) {
87+
stream.on('error', (err) => {
8888
assert(err);
8989
done();
9090
});
91-
stream.on('data', function (newFile) {
91+
stream.on('data', (newFile) => {
9292
assert(newFile);
9393
assert(newFile.contents);
94-
newFile.contents.pipe(es.wait(function (err, data) {
94+
newFile.contents.pipe(es.wait((err, data) => {
9595
assert(!err);
9696
assert.equal(data.toString('utf-8'), String(expectedFile.contents));
9797
done();
@@ -101,34 +101,34 @@ describe('gulp-unassert', function () {
101101
stream.end();
102102
});
103103

104-
describe('should not throw but emit error when the file has a syntax error', function () {
105-
it('when file is Buffer', function (done) {
106-
var stream = unassert();
107-
var srcFile = new Vinyl({
108-
path: process.cwd() + '/test/fixtures/syntax-error/fixture.js',
104+
describe('should not throw but emit error when the file has a syntax error', () => {
105+
it('when file is Buffer', (done) => {
106+
const stream = unassert();
107+
const srcFile = new Vinyl({
108+
path: join(process.cwd(), 'test', 'fixtures', 'syntax-error', 'fixture.js'),
109109
cwd: process.cwd(),
110-
base: process.cwd() + '/test/fixtures/syntax-error',
111-
contents: fs.readFileSync('test/fixtures/syntax-error/fixture.js')
110+
base: join(process.cwd(), 'test', 'fixtures', 'syntax-error'),
111+
contents: fs.readFileSync(join('test', 'fixtures', 'syntax-error', 'fixture.js'))
112112
});
113-
assert.doesNotThrow(function () {
114-
stream.on('error', function (err) {
113+
assert.doesNotThrow(() => {
114+
stream.on('error', (err) => {
115115
assert(err);
116116
done();
117117
});
118118
stream.write(srcFile);
119119
stream.end();
120120
});
121121
});
122-
it('when file is Stream', function (done) {
123-
var stream = unassert();
124-
var srcStream = new Vinyl({
125-
path: process.cwd() + '/test/fixtures/syntax-error/fixture.js',
122+
it('when file is Stream', (done) => {
123+
const stream = unassert();
124+
const srcStream = new Vinyl({
125+
path: join(process.cwd(), 'test', 'fixtures', 'syntax-error', 'fixture.js'),
126126
cwd: process.cwd(),
127-
base: process.cwd() + '/test/fixtures/syntax-error',
128-
contents: fs.createReadStream('test/fixtures/syntax-error/fixture.js')
127+
base: join(process.cwd(), 'test', 'fixtures', 'syntax-error'),
128+
contents: fs.createReadStream(join('test', 'fixtures', 'syntax-error', 'fixture.js'))
129129
});
130-
assert.doesNotThrow(function () {
131-
stream.on('error', function (err) {
130+
assert.doesNotThrow(() => {
131+
stream.on('error', (err) => {
132132
assert(err);
133133
done();
134134
});
@@ -138,14 +138,14 @@ describe('gulp-unassert', function () {
138138
});
139139
});
140140

141-
describe('SourceMap support', function () {
142-
it('with initial sourceMap created by gulp-sourcemaps', function (done) {
143-
var stream = unassert();
144-
var srcFileContents = fs.readFileSync('test/fixtures/patterns/fixture.js');
145-
var srcFile = new Vinyl({
146-
path: process.cwd() + '/test/fixtures/patterns/fixture.js',
141+
describe('SourceMap support', () => {
142+
it('with initial sourceMap created by gulp-sourcemaps', (done) => {
143+
const stream = unassert();
144+
const srcFileContents = fs.readFileSync(join('test', 'fixtures', 'patterns', 'fixture.js'));
145+
const srcFile = new Vinyl({
146+
path: join(process.cwd(), 'test', 'fixtures', 'patterns', 'fixture.js'),
147147
cwd: process.cwd(),
148-
base: process.cwd() + '/test/fixtures/patterns',
148+
base: join(process.cwd(), 'test', 'fixtures', 'patterns'),
149149
contents: srcFileContents
150150
});
151151
// simulate initial raw map created by gulp-sourcemaps
@@ -157,14 +157,15 @@ describe('gulp-unassert', function () {
157157
sources: [srcFile.relative],
158158
sourcesContent: [srcFileContents.toString('utf8')]
159159
};
160-
stream.on('error', function (err) {
160+
stream.on('error', (err) => {
161161
assert(err);
162162
done(err);
163163
});
164-
stream.on('data', function (newFile) {
164+
stream.on('data', (newFile) => {
165165
assert(newFile);
166166
assert(newFile.contents);
167-
assert.equal(newFile.contents.toString(), fs.readFileSync('test/fixtures/patterns/expected.js', 'utf8'));
167+
const expectedContent = fs.readFileSync(join('test', 'fixtures', 'patterns', 'expected.js'), 'utf8');
168+
assert.equal(newFile.contents.toString(), expectedContent);
168169
assert(newFile.sourceMap, 'push file.sourceMap to downstream');
169170
assert.deepEqual(newFile.sourceMap, {
170171
version: 3,
@@ -186,14 +187,14 @@ describe('gulp-unassert', function () {
186187
stream.end();
187188
});
188189

189-
it('with upstream sourceMap', function (done) {
190-
var stream = unassert();
191-
var originalFileContents = fs.readFileSync('test/fixtures/coffee/fixture.coffee', 'utf8');
192-
var srcFile = new Vinyl({
193-
path: process.cwd() + '/test/fixtures/coffee/fixture.js',
190+
it('with upstream sourceMap', (done) => {
191+
const stream = unassert();
192+
const originalFileContents = fs.readFileSync(join(process.cwd(), 'test', 'fixtures', 'coffee', 'fixture.coffee'), 'utf8');
193+
const srcFile = new Vinyl({
194+
path: join(process.cwd(), 'test', 'fixtures', 'coffee', 'fixture.js'),
194195
cwd: process.cwd(),
195-
base: process.cwd() + '/test/fixtures/coffee',
196-
contents: fs.readFileSync('test/fixtures/coffee/fixture.js')
196+
base: join(process.cwd(), 'test', 'fixtures', 'coffee'),
197+
contents: fs.readFileSync(join(process.cwd(), 'test', 'fixtures', 'coffee', 'fixture.js'))
197198
});
198199
srcFile.sourceMap = {
199200
version: 3,
@@ -204,14 +205,15 @@ describe('gulp-unassert', function () {
204205
sourceRoot: '',
205206
sourcesContent: [originalFileContents]
206207
};
207-
stream.on('error', function (err) {
208+
stream.on('error', (err) => {
208209
assert(err);
209210
done(err);
210211
});
211-
stream.on('data', function (newFile) {
212+
stream.on('data', (newFile) => {
212213
assert(newFile);
213214
assert(newFile.contents);
214-
assert.equal(newFile.contents.toString() + '\n', fs.readFileSync('test/fixtures/coffee/expected.js', 'utf8'));
215+
const expectedContent = fs.readFileSync(join(process.cwd(), 'test', 'fixtures', 'coffee', 'expected.js'), 'utf8');
216+
assert.equal(newFile.contents.toString() + '\n', expectedContent);
215217
assert(newFile.sourceMap, 'push file.sourceMap to downstream');
216218
assert.deepEqual(newFile.sourceMap, {
217219
version: 3,

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy