Update glob to 10.3.3

pascalre · Aug 17, 2023 · b4a9801 · b4a9801
1 parent b2f9822
commit b4a9801
Show file tree

Hide file tree

Showing 11 changed files with 83 additions and 152 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -282,7 +282,7 @@
     "@types/vscode": "^1.80.0",
     "@vscode/test-electron": "^2.1.5",
     "cloudformation-js-yaml-schema": "^0.4.2",
-    "glob": "^8.0.3",
+    "glob": "^10.3.3",
     "homeassistant-js-yaml-schema": "^1.1.0",
     "js-yaml": "^4.1.0"
   }

diff --git a/src/test/files/testFormatYamlWrapper2.yaml b/src/test/files/testFormatYamlWrapper2.yaml
@@ -0,0 +1,2 @@
+key:
+  key2: value
diff --git a/src/test/files/testGetActiveDocument.yaml b/src/test/files/testGetActiveDocument.yaml
@@ -0,0 +1,2 @@
+key:
+  key2: value
diff --git a/src/test/files/testMetadataTags.yaml b/src/test/files/testMetadataTags.yaml
@@ -0,0 +1,2 @@
+key:
+  key2: value
diff --git a/src/test/files/testValidateYamlWrapper.yaml b/src/test/files/testValidateYamlWrapper.yaml
@@ -0,0 +1,2 @@
+key:
+  key2: value
diff --git a/src/test/suite/adapter/vs-code-adapter.test.ts b/src/test/suite/adapter/vs-code-adapter.test.ts
@@ -30,7 +30,7 @@ suite("Test VsCodeAdapter - applyEdits()", () => {
 
 suite("Test VsCodeAdapter - getActiveDocument()", () => {
   test("when text editor is active should open document", async () => {
-    const uri = Uri.parse(path.resolve("./src/test/files/getYamlFilesInDirectory/file.yaml"))
+    const uri = Uri.parse(path.resolve("./src/test/files/testGetActiveDocument.yaml"))
     const doc = await workspace.openTextDocument(uri)
     await window.showTextDocument(doc, { preview: false })
 

diff --git a/src/test/suite/controller/controller.test.ts b/src/test/suite/controller/controller.test.ts
@@ -24,7 +24,7 @@ suite("Test sortYamlFiles", () => {
 
 suite("Test validateYamlWrapper", () => {
   test("should return true on open document", async () => {
-    const uri = Uri.parse(resolve("./src/test/files/getYamlFilesInDirectory/file.yaml"))
+    const uri = Uri.parse(resolve("./src/test/files/testValidateYamlWrapper.yaml"))
     const doc = await workspace.openTextDocument(uri)
     await window.showTextDocument(doc, { preview: false })
     equal(new Controller().validateYamlWrapper(), true)
@@ -33,7 +33,7 @@ suite("Test validateYamlWrapper", () => {
 
 suite("Test formatYamlWrapper", () => {
   test("should return true on a valid yaml", async () => {
-    const uri = Uri.parse(resolve("./src/test/files/getYamlFilesInDirectory/file.yaml"))
+    const uri = Uri.parse(resolve("./src/test/files/testFormatYamlWrapper2.yaml"))
     const doc = await workspace.openTextDocument(uri)
     await window.showTextDocument(doc, { preview: false })
 

diff --git a/src/test/suite/extension.test.ts b/src/test/suite/extension.test.ts
@@ -136,16 +136,14 @@ suite("Test sortYamlWrapper", () => {
     }
   })
   test("should remove yaml metadata tags (directives)", async () => {
-    // Todo: This test needs a refactoring
-    const uri = Uri.parse(resolve("./src/test/files/getYamlFilesInDirectory/file.yaml"))
-    // const uri = Uri.parse(resolve("./src/test/files/testSortYaml.yaml"))
+    const uri = Uri.parse(resolve("./src/test/files/testMetadataTags.yaml"))
     const doc = await workspace.openTextDocument(uri)
     await window.showTextDocument(doc, { preview: false })
 
     const activeEditor = window.activeTextEditor
     if (activeEditor) {
       const actual =
-        "%YAML 1.1" +
+        "%YAML 1.1\n" +
         "---\n" +
         "key:\n" +
         "  key2: value"
@@ -160,8 +158,6 @@ suite("Test sortYamlWrapper", () => {
         actual))
 
       await commands.executeCommand("vscode-yaml-sort.sortYaml")
-      // do not assert too fast
-      // await new Promise(r => setTimeout(r, 2000));
       equal(activeEditor.document.getText(), expected)
     } else {
       equal(true, false)

diff --git a/src/test/suite/util/file-util.test.ts b/src/test/suite/util/file-util.test.ts
@@ -12,22 +12,22 @@ suite("Test FileUtil - getFiles()", () => {
 
   test("should return all files", () => {
     const expected = [
-      "./src/test/suite/util/resources/foo.yaml",
-      "./src/test/suite/util/resources/subfolder/foo2.yaml",
-      "./src/test/suite/util/resources/bar.yml",
-      "./src/test/suite/util/resources/subfolder/.customyaml",
+      "src/test/suite/util/resources/bar.yml",
+      "src/test/suite/util/resources/foo.yaml",
+      "src/test/suite/util/resources/subfolder/.customyaml",
+      "src/test/suite/util/resources/subfolder/foo2.yaml"
     ]
     deepEqual(fileutil.getFiles("./src/test/suite/util/resources"), expected)
   })
 
   test("should list all files with extension *.yaml or *.yml in a directory and all its subdirectories", () => {
     const expected = [
-      "./src/test/files/getYamlFilesInDirectory/file.yaml",
-      "./src/test/files/getYamlFilesInDirectory/file2.yaml",
-      "./src/test/files/getYamlFilesInDirectory/folder1/file.yaml",
-      "./src/test/files/getYamlFilesInDirectory/folder1/file2.yaml",
-      "./src/test/files/getYamlFilesInDirectory/folder2/file.yaml",
-      "./src/test/files/getYamlFilesInDirectory/file.yml"
+      "src/test/files/getYamlFilesInDirectory/file.yaml",
+      "src/test/files/getYamlFilesInDirectory/file.yml",
+      "src/test/files/getYamlFilesInDirectory/file2.yaml",
+      "src/test/files/getYamlFilesInDirectory/folder1/file.yaml",
+      "src/test/files/getYamlFilesInDirectory/folder1/file2.yaml",
+      "src/test/files/getYamlFilesInDirectory/folder2/file.yaml"
     ]
     deepEqual(fileutil.getFiles("./src/test/files/getYamlFilesInDirectory"), expected)
   })

diff --git a/src/util/file-util.ts b/src/util/file-util.ts
@@ -19,7 +19,7 @@ export class FileUtil {
     for (const extension of this.settings.getExtensions()) {
       files = files.concat(sync(`${path}/**/*.${extension}`, this.globOptions))
     }
-    return files
+    return files.sort()
   }
 
   readFile(file: string) {