Skip to content

Commit c11b4ab

Browse files
committed
refactor: make test more readable
1 parent 66c4137 commit c11b4ab

File tree

1 file changed

+36
-24
lines changed

1 file changed

+36
-24
lines changed

test/files/glob-source.spec.js

+36-24
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,25 @@ chai.use(dirtyChai)
1616
chai.use(chaiAsPromised)
1717
const expect = chai.expect
1818

19+
function fixture (file) {
20+
return path.resolve(path.join(__dirname, '..', 'fixtures', file))
21+
}
22+
23+
function findMode (file) {
24+
return fs.statSync(fixture(file)).mode
25+
}
26+
27+
function findMtime (file) {
28+
return parseInt(fs.statSync(fixture(file)).mtimeMs / 1000)
29+
}
30+
1931
describe('glob-source', () => {
2032
it('single file, relative path', async function () {
2133
if (!isNode) {
2234
return this.skip()
2335
}
2436

25-
const result = await all(globSource(path.relative(process.cwd(), path.join(__dirname, '..', 'fixtures', 'file-0.html'))))
37+
const result = await all(globSource(fixture('file-0.html')))
2638

2739
expect(result.length).to.equal(1)
2840
expect(result[0].path).to.equal('/file-0.html')
@@ -33,7 +45,7 @@ describe('glob-source', () => {
3345
return this.skip()
3446
}
3547

36-
const result = await all(globSource(path.resolve(process.cwd(), path.join(__dirname, '..', 'fixtures', 'file-0.html'))))
48+
const result = await all(globSource(fixture('file-0.html')))
3749

3850
expect(result.length).to.equal(1)
3951
expect(result[0].path).to.equal('/file-0.html')
@@ -44,7 +56,7 @@ describe('glob-source', () => {
4456
return this.skip()
4557
}
4658

47-
const result = await all(globSource(path.relative(process.cwd(), path.join(__dirname, '..', 'fixtures', 'dir')), {
59+
const result = await all(globSource(fixture('/dir'), {
4860
recursive: true
4961
}))
5062

@@ -63,7 +75,7 @@ describe('glob-source', () => {
6375
return this.skip()
6476
}
6577

66-
const result = await all(globSource(path.resolve(process.cwd(), path.join(__dirname, '..', 'fixtures', 'dir')), {
78+
const result = await all(globSource(fixture('/dir'), {
6779
recursive: true,
6880
hidden: true
6981
}))
@@ -83,7 +95,7 @@ describe('glob-source', () => {
8395
return this.skip()
8496
}
8597

86-
const result = await all(globSource(path.resolve(process.cwd(), path.join(__dirname, '..', 'fixtures', 'dir')), {
98+
const result = await all(globSource(fixture('/dir'), {
8799
recursive: true,
88100
ignore: ['**/file-1.txt']
89101
}))
@@ -102,8 +114,8 @@ describe('glob-source', () => {
102114
}
103115

104116
const result = await all(globSource([
105-
path.relative(process.cwd(), path.join(__dirname, '..', 'fixtures', 'dir', 'file-1.txt')),
106-
path.relative(process.cwd(), path.join(__dirname, '..', 'fixtures', 'dir', 'file-2.js'))
117+
fixture('/dir/file-1.txt'),
118+
fixture('/dir/file-2.js')
107119
]))
108120

109121
expect(result).to.have.lengthOf(2)
@@ -116,40 +128,40 @@ describe('glob-source', () => {
116128
return this.skip()
117129
}
118130

119-
await expect(all(globSource(path.resolve(process.cwd(), path.join(__dirname, '..', 'fixtures', 'dir'))))).to.be.rejectedWith(/recursive option not set/)
131+
await expect(all(globSource(fixture('/dir')))).to.be.rejectedWith(/recursive option not set/)
120132
})
121133

122134
it('preserves mode for directories', async function () {
123135
if (!isNode) {
124136
return this.skip()
125137
}
126138

127-
const result = await all(globSource(path.resolve(path.join(__dirname, '..', 'fixtures', 'dir')), {
139+
const result = await all(globSource(fixture('/dir'), {
128140
preserveMode: true,
129141
recursive: true
130142
}))
131143

132144
expect(result).to.have.lengthOf(6)
133145
expect(result).to.have.nested.property('[0].path', '/dir')
134-
expect(result).to.have.nested.property('[0].mode', fs.statSync(path.resolve(path.join(__dirname, '..', 'fixtures', 'dir'))).mode)
146+
expect(result).to.have.nested.property('[0].mode', findMode('/dir'))
135147
expect(result).to.have.nested.property('[1].path', '/dir/file-1.txt')
136-
expect(result).to.have.nested.property('[1].mode', fs.statSync(path.resolve(path.join(__dirname, '..', 'fixtures', 'dir', 'file-1.txt'))).mode)
148+
expect(result).to.have.nested.property('[1].mode', findMode('/dir/file-1.txt'))
137149
expect(result).to.have.nested.property('[2].path', '/dir/file-2.js')
138-
expect(result).to.have.nested.property('[2].mode', fs.statSync(path.resolve(path.join(__dirname, '..', 'fixtures', 'dir', 'file-2.js'))).mode)
150+
expect(result).to.have.nested.property('[2].mode', findMode('/dir/file-2.js'))
139151
expect(result).to.have.nested.property('[3].path', '/dir/file-3.css')
140-
expect(result).to.have.nested.property('[3].mode', fs.statSync(path.resolve(path.join(__dirname, '..', 'fixtures', 'dir', 'file-3.css'))).mode)
152+
expect(result).to.have.nested.property('[3].mode', findMode('/dir/file-3.css'))
141153
expect(result).to.have.nested.property('[4].path', '/dir/nested-dir')
142-
expect(result).to.have.nested.property('[4].mode', fs.statSync(path.resolve(path.join(__dirname, '..', 'fixtures', 'dir', 'nested-dir'))).mode)
154+
expect(result).to.have.nested.property('[4].mode', findMode('/dir/nested-dir'))
143155
expect(result).to.have.nested.property('[5].path', '/dir/nested-dir/other.txt')
144-
expect(result).to.have.nested.property('[5].mode', fs.statSync(path.resolve(path.join(__dirname, '..', 'fixtures', 'dir', 'nested-dir', 'other.txt'))).mode)
156+
expect(result).to.have.nested.property('[5].mode', findMode('/dir/nested-dir/other.txt'))
145157
})
146158

147159
it('overrides mode for directories', async function () {
148160
if (!isNode) {
149161
return this.skip()
150162
}
151163

152-
const result = await all(globSource(path.resolve(process.cwd(), path.join(__dirname, '..', 'fixtures', 'dir')), {
164+
const result = await all(globSource(fixture('/dir'), {
153165
recursive: true,
154166
mode: 5
155167
}))
@@ -174,32 +186,32 @@ describe('glob-source', () => {
174186
return this.skip()
175187
}
176188

177-
const result = await all(globSource(path.resolve(path.join(__dirname, '..', 'fixtures', 'dir')), {
189+
const result = await all(globSource(fixture('/dir'), {
178190
preserveMtime: true,
179191
recursive: true
180192
}))
181193

182194
expect(result).to.have.lengthOf(6)
183195
expect(result).to.have.nested.property('[0].path', '/dir')
184-
expect(result).to.have.nested.property('[0].mtime', parseInt(fs.statSync(path.resolve(path.join(__dirname, '..', 'fixtures', 'dir'))).mtimeMs / 1000))
196+
expect(result).to.have.nested.property('[0].mtime', findMtime('/dir'))
185197
expect(result).to.have.nested.property('[1].path', '/dir/file-1.txt')
186-
expect(result).to.have.nested.property('[1].mtime', parseInt(fs.statSync(path.resolve(path.join(__dirname, '..', 'fixtures', 'dir', 'file-1.txt'))).mtimeMs / 1000))
198+
expect(result).to.have.nested.property('[1].mtime', findMtime('/dir/file-1.txt'))
187199
expect(result).to.have.nested.property('[2].path', '/dir/file-2.js')
188-
expect(result).to.have.nested.property('[2].mtime', parseInt(fs.statSync(path.resolve(path.join(__dirname, '..', 'fixtures', 'dir', 'file-2.js'))).mtimeMs / 1000))
200+
expect(result).to.have.nested.property('[2].mtime', findMtime('/dir/file-2.js'))
189201
expect(result).to.have.nested.property('[3].path', '/dir/file-3.css')
190-
expect(result).to.have.nested.property('[3].mtime', parseInt(fs.statSync(path.resolve(path.join(__dirname, '..', 'fixtures', 'dir', 'file-3.css'))).mtimeMs / 1000))
202+
expect(result).to.have.nested.property('[3].mtime', findMtime('/dir/file-3.css'))
191203
expect(result).to.have.nested.property('[4].path', '/dir/nested-dir')
192-
expect(result).to.have.nested.property('[4].mtime', parseInt(fs.statSync(path.resolve(path.join(__dirname, '..', 'fixtures', 'dir', 'nested-dir'))).mtimeMs / 1000))
204+
expect(result).to.have.nested.property('[4].mtime', findMtime('/dir/nested-dir'))
193205
expect(result).to.have.nested.property('[5].path', '/dir/nested-dir/other.txt')
194-
expect(result).to.have.nested.property('[5].mtime', parseInt(fs.statSync(path.resolve(path.join(__dirname, '..', 'fixtures', 'dir', 'nested-dir', 'other.txt'))).mtimeMs / 1000))
206+
expect(result).to.have.nested.property('[5].mtime', findMtime('/dir/nested-dir/other.txt'))
195207
})
196208

197209
it('overrides mtime for directories', async function () {
198210
if (!isNode) {
199211
return this.skip()
200212
}
201213

202-
const result = await all(globSource(path.resolve(process.cwd(), path.join(__dirname, '..', 'fixtures', 'dir')), {
214+
const result = await all(globSource(fixture('/dir'), {
203215
recursive: true,
204216
mtime: 5
205217
}))

0 commit comments

Comments
 (0)