Update to latest @actions/glob and fix tests

actions · Aug 15, 2024 · a0c40cf · a0c40cf
1 parent acb59e4
commit a0c40cf
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 26 deletions.
diff --git a/__tests__/search.test.ts b/__tests__/search.test.ts
@@ -61,13 +61,13 @@ const lonelyFilePath = path.join(
   'lonely-file.txt'
 )
 
+const hiddenFile = path.join(root, '.hidden-file.txt')
 const fileInHiddenFolderPath = path.join(
   root,
   '.hidden-folder',
   'folder-in-hidden-folder',
   'file.txt'
 )
-const hiddenFile = path.join(root, '.hidden-file.txt')
 const fileInHiddenFolderInFolderA = path.join(
   root,
   'folder-a',
@@ -132,6 +132,10 @@ describe('Search', () => {
     await fs.writeFile(amazingFileInFolderHPath, 'amazing file')
 
     await fs.writeFile(lonelyFilePath, 'all by itself')
+
+    await fs.writeFile(hiddenFile, 'hidden file')
+    await fs.writeFile(fileInHiddenFolderPath, 'file in hidden directory')
+    await fs.writeFile(fileInHiddenFolderInFolderA, 'file in hidden directory')
     /*
       Directory structure of files that get created:
       root/
@@ -385,25 +389,19 @@ describe('Search', () => {
     const searchPath = path.join(root, '**/*')
     const searchResult = await findFilesToUpload(searchPath)
 
-    expect(searchResult.filesToUpload.includes(hiddenFile)).toEqual(false)
-    expect(searchResult.filesToUpload.includes(fileInHiddenFolderPath)).toEqual(
-      false
+    expect(searchResult.filesToUpload).not.toContain(hiddenFile)
+    expect(searchResult.filesToUpload).not.toContain(fileInHiddenFolderPath)
+    expect(searchResult.filesToUpload).not.toContain(
+      fileInHiddenFolderInFolderA
     )
-    expect(
-      searchResult.filesToUpload.includes(fileInHiddenFolderInFolderA)
-    ).toEqual(false)
   })
 
   it('Hidden files included', async () => {
     const searchPath = path.join(root, '**/*')
     const searchResult = await findFilesToUpload(searchPath, true)
 
-    expect(searchResult.filesToUpload.includes(hiddenFile)).toEqual(false)
-    expect(searchResult.filesToUpload.includes(fileInHiddenFolderPath)).toEqual(
-      false
-    )
-    expect(
-      searchResult.filesToUpload.includes(fileInHiddenFolderInFolderA)
-    ).toEqual(false)
+    expect(searchResult.filesToUpload).toContain(hiddenFile)
+    expect(searchResult.filesToUpload).toContain(fileInHiddenFolderPath)
+    expect(searchResult.filesToUpload).toContain(fileInHiddenFolderInFolderA)
   })
 })
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "@actions/artifact": "2.1.8",
     "@actions/core": "^1.10.1",
     "@actions/github": "^6.0.0",
-    "@actions/glob": "^0.3.0",
+    "@actions/glob": "^0.5.0",
     "@actions/io": "^1.1.2",
     "minimatch": "^9.0.3"
   },

diff --git a/src/shared/search.ts b/src/shared/search.ts
@@ -11,12 +11,12 @@ export interface SearchResult {
   rootDirectory: string
 }
 
-function getDefaultGlobOptions(_includeHiddenFiles: boolean): glob.GlobOptions {
+function getDefaultGlobOptions(includeHiddenFiles: boolean): glob.GlobOptions {
   return {
     followSymbolicLinks: true,
     implicitDescendants: true,
     omitBrokenSymbolicLinks: true,
-    // excludeHiddenFiles: !includeHiddenFiles,
+    excludeHiddenFiles: !includeHiddenFiles,
   }
 }