Skip to content

Commit 124ebe1

Browse files
author
Peter Bengtsson
authored
rename data files from .yaml to .yml (github#31162)
1 parent 93a3e80 commit 124ebe1

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

lib/data-directory.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default function dataDirectory(dir, opts = {}) {
1313
return content
1414
},
1515
ignorePatterns: [/README\.md$/i],
16-
extensions: ['.json', '.md', '.markdown', '.yaml', '.yml'],
16+
extensions: ['.json', '.md', '.markdown', '.yml'],
1717
}
1818

1919
opts = Object.assign({}, defaultOpts, opts)
@@ -53,7 +53,6 @@ export default function dataDirectory(dir, opts = {}) {
5353
case '.json':
5454
setWith(data, key, JSON.parse(fileContent), Object)
5555
break
56-
case '.yaml':
5756
case '.yml':
5857
setWith(data, key, yaml.load(fileContent, { filename }), Object)
5958
break

tests/unit/data-directory/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const fixturesDir = path.join(__dirname, 'fixtures')
66

77
describe('data-directory', () => {
88
test('works', async () => {
9-
const data = await dataDirectory(fixturesDir)
9+
const data = dataDirectory(fixturesDir)
1010
const expected = {
1111
bar: { another_markup_language: 'yes' },
1212
foo: { meaningOfLife: 42 },
@@ -19,13 +19,13 @@ describe('data-directory', () => {
1919
const preprocess = function (content) {
2020
return content.replace('markdown', 'MARKDOWN')
2121
}
22-
const data = await dataDirectory(fixturesDir, { preprocess })
22+
const data = dataDirectory(fixturesDir, { preprocess })
2323
expect(data.nested.baz).toBe('I am MARKDOWN!')
2424
})
2525

2626
test('option: extensions array', async () => {
27-
const extensions = ['.yaml', 'markdown']
28-
const data = await dataDirectory(fixturesDir, { extensions })
27+
const extensions = ['.yml', 'markdown']
28+
const data = dataDirectory(fixturesDir, { extensions })
2929
expect('bar' in data).toBe(true)
3030
expect('foo' in data).toBe(false) // JSON file should be ignored
3131
})
@@ -34,9 +34,9 @@ describe('data-directory', () => {
3434
const ignorePatterns = []
3535

3636
// README is ignored by default
37-
expect('README' in (await dataDirectory(fixturesDir))).toBe(false)
37+
expect('README' in dataDirectory(fixturesDir)).toBe(false)
3838

3939
// README can be included by setting empty ignorePatterns array
40-
expect('README' in (await dataDirectory(fixturesDir, { ignorePatterns }))).toBe(true)
40+
expect('README' in dataDirectory(fixturesDir, { ignorePatterns })).toBe(true)
4141
})
4242
})

0 commit comments

Comments
 (0)