From 124ebe134d666b5bdeb93e75c046651c7c79881b Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <peterbe@github.com>
Date: Mon, 26 Sep 2022 21:48:29 +0200
Subject: [PATCH] rename data files from .yaml to .yml (#31162)

---
 ...urity-updates-unlock-transitive-dependencies.yml} |  0
 ...ting.yaml => profile-name-enterprise-setting.yml} |  0
 lib/data-directory.js                                |  3 +--
 .../data-directory/fixtures/{bar.yaml => bar.yml}    |  0
 tests/unit/data-directory/index.js                   | 12 ++++++------
 5 files changed, 7 insertions(+), 8 deletions(-)
 rename data/features/{dependabot-security-updates-unlock-transitive-dependencies.yaml => dependabot-security-updates-unlock-transitive-dependencies.yml} (100%)
 rename data/features/{profile-name-enterprise-setting.yaml => profile-name-enterprise-setting.yml} (100%)
 rename tests/unit/data-directory/fixtures/{bar.yaml => bar.yml} (100%)

diff --git a/data/features/dependabot-security-updates-unlock-transitive-dependencies.yaml b/data/features/dependabot-security-updates-unlock-transitive-dependencies.yml
similarity index 100%
rename from data/features/dependabot-security-updates-unlock-transitive-dependencies.yaml
rename to data/features/dependabot-security-updates-unlock-transitive-dependencies.yml
diff --git a/data/features/profile-name-enterprise-setting.yaml b/data/features/profile-name-enterprise-setting.yml
similarity index 100%
rename from data/features/profile-name-enterprise-setting.yaml
rename to data/features/profile-name-enterprise-setting.yml
diff --git a/lib/data-directory.js b/lib/data-directory.js
index b7f4bdbd5a..0150c7a66c 100644
--- a/lib/data-directory.js
+++ b/lib/data-directory.js
@@ -13,7 +13,7 @@ export default function dataDirectory(dir, opts = {}) {
       return content
     },
     ignorePatterns: [/README\.md$/i],
-    extensions: ['.json', '.md', '.markdown', '.yaml', '.yml'],
+    extensions: ['.json', '.md', '.markdown', '.yml'],
   }
 
   opts = Object.assign({}, defaultOpts, opts)
@@ -53,7 +53,6 @@ export default function dataDirectory(dir, opts = {}) {
       case '.json':
         setWith(data, key, JSON.parse(fileContent), Object)
         break
-      case '.yaml':
       case '.yml':
         setWith(data, key, yaml.load(fileContent, { filename }), Object)
         break
diff --git a/tests/unit/data-directory/fixtures/bar.yaml b/tests/unit/data-directory/fixtures/bar.yml
similarity index 100%
rename from tests/unit/data-directory/fixtures/bar.yaml
rename to tests/unit/data-directory/fixtures/bar.yml
diff --git a/tests/unit/data-directory/index.js b/tests/unit/data-directory/index.js
index fe4a376ec6..6c9f03c3cf 100644
--- a/tests/unit/data-directory/index.js
+++ b/tests/unit/data-directory/index.js
@@ -6,7 +6,7 @@ const fixturesDir = path.join(__dirname, 'fixtures')
 
 describe('data-directory', () => {
   test('works', async () => {
-    const data = await dataDirectory(fixturesDir)
+    const data = dataDirectory(fixturesDir)
     const expected = {
       bar: { another_markup_language: 'yes' },
       foo: { meaningOfLife: 42 },
@@ -19,13 +19,13 @@ describe('data-directory', () => {
     const preprocess = function (content) {
       return content.replace('markdown', 'MARKDOWN')
     }
-    const data = await dataDirectory(fixturesDir, { preprocess })
+    const data = dataDirectory(fixturesDir, { preprocess })
     expect(data.nested.baz).toBe('I am MARKDOWN!')
   })
 
   test('option: extensions array', async () => {
-    const extensions = ['.yaml', 'markdown']
-    const data = await dataDirectory(fixturesDir, { extensions })
+    const extensions = ['.yml', 'markdown']
+    const data = dataDirectory(fixturesDir, { extensions })
     expect('bar' in data).toBe(true)
     expect('foo' in data).toBe(false) // JSON file should be ignored
   })
@@ -34,9 +34,9 @@ describe('data-directory', () => {
     const ignorePatterns = []
 
     // README is ignored by default
-    expect('README' in (await dataDirectory(fixturesDir))).toBe(false)
+    expect('README' in dataDirectory(fixturesDir)).toBe(false)
 
     // README can be included by setting empty ignorePatterns array
-    expect('README' in (await dataDirectory(fixturesDir, { ignorePatterns }))).toBe(true)
+    expect('README' in dataDirectory(fixturesDir, { ignorePatterns })).toBe(true)
   })
 })