test: fix tests

netlify · Jan 11, 2023 · 763f07d · 763f07d
1 parent f210cdb
commit 763f07d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/zip.ts b/src/zip.ts
@@ -70,9 +70,11 @@ export const zipFunctions = async function (
   const logger = getLogger(systemLog, debug)
   const cache = new RuntimeCache()
   const featureFlags = getFlags(inputFeatureFlags)
-  const srcFolders = resolveFunctionsDirectories(
-    [...relativeSrcFolders, internalFunctionsFolder].filter(Boolean) as string[],
-  )
+  const functionsDirectories = [
+    ...(Array.isArray(relativeSrcFolders) ? relativeSrcFolders : [relativeSrcFolders]),
+    internalFunctionsFolder,
+  ].filter(Boolean) as string[]
+  const srcFolders = resolveFunctionsDirectories(functionsDirectories)
   const internalFunctionsPath = internalFunctionsFolder && resolve(internalFunctionsFolder)
 
   const [paths] = await Promise.all([listFunctionsDirectories(srcFolders), fs.mkdir(destFolder, { recursive: true })])

diff --git a/tests/main.test.ts b/tests/main.test.ts
@@ -14,7 +14,6 @@ import unixify from 'unixify'
 import { afterAll, afterEach, describe, expect, test, vi } from 'vitest'
 
 import type { Config } from '../src/config.js'
-import { FUNCTIONS_INTERNAL_DIR } from '../src/runtimes/constants.js'
 import { ESBUILD_LOG_LIMIT } from '../src/runtimes/node/bundlers/esbuild/bundler.js'
 import { NodeBundlerType } from '../src/runtimes/node/bundlers/types.js'
 import { detectEsModule } from '../src/runtimes/node/utils/detect_es_module.js'
@@ -75,10 +74,14 @@ describe('zip-it-and-ship-it', () => {
     'Zips Node.js function files from an internal-functions dir with a configured displayName',
     [...allBundleConfigs, 'bundler_none'],
     async (options) => {
-      const fixtureName = join('node-internal', FUNCTIONS_INTERNAL_DIR)
-      const { files } = await zipNode(fixtureName, {
+      const fixtureName = join('node-internal', '.netlify/internal-functions')
+      const { files } = await zipFixture(fixtureName, {
         length: 2,
-        opts: { ...options, config: { 'function-1': { displayName: 'Function One' } } },
+        opts: {
+          internalFunctionsFolder: join(FIXTURES_DIR, fixtureName),
+          ...options,
+          config: { 'function-1': { displayName: 'Function One' } },
+        },
       })
       expect(files).toHaveLength(2)
       expect(files[0].isInternalFunction).toBeTruthy()
@@ -1769,10 +1772,11 @@ describe('zip-it-and-ship-it', () => {
       return {} as any
     })
 
-    const fixtureName = join('go-internal', FUNCTIONS_INTERNAL_DIR)
+    const fixtureName = join('go-internal', '.netlify/internal-functions')
     const { files } = await zipFixture(fixtureName, {
       length: 2,
       opts: {
+        internalFunctionsFolder: join(FIXTURES_DIR, fixtureName),
         config: {
           'go-func-1': {
             displayName: 'Go Function One',
@@ -1962,10 +1966,11 @@ describe('zip-it-and-ship-it', () => {
       }
     })
 
-    const fixtureName = join('rust-internal', FUNCTIONS_INTERNAL_DIR)
+    const fixtureName = join('rust-internal', '.netlify/internal-functions')
     const { files } = await zipFixture(fixtureName, {
       length: 2,
       opts: {
+        internalFunctionsFolder: join(FIXTURES_DIR, fixtureName),
         config: {
           'rust-func-1': {
             displayName: 'Rust Function Two',