fix: add test for generator field and remove internalSrcFolder usage (#4857)

* test: add test and remove internalSrcFolder usage

* chore: update zip-it-and-ship-it

Author: khendrikse

package-lock.json

@@ -71,7 +71,7 @@
     "@netlify/git-utils": "^5.1.0",
     "@netlify/plugins-list": "^6.65.0",
     "@netlify/run-utils": "^5.1.0",
-    "@netlify/zip-it-and-ship-it": "^8.6.0",
+    "@netlify/zip-it-and-ship-it": "^8.7.0",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^5.0.0",
     "chalk": "^5.0.0",

packages/build/package.json

@@ -30,7 +30,6 @@ export const getZisiParameters = ({
     featureFlags: zisiFeatureFlags,
     repositoryRoot,
     configFileDirectories,
-    internalSrcFolder: internalFunctionsSrc,
   }
 }
 

packages/build/src/plugins_core/functions/zisi.js

@@ -1,4 +1,4 @@
 {
-  "config": { "nodeBundler": "none" },
+  "config": { "nodeBundler": "none", "name": "Function One", "generator": "@netlify/[email protected]" },
   "version": 1
 }

packages/build/tests/core/fixtures/functions_config_json/.netlify/functions-internal/function_two.json

@@ -2235,7 +2235,7 @@ Generated by [AVA](https://avajs.dev).
     (Netlify Build completed in 1ms)␊
     Build step duration: Netlify Build completed in 1ms`
 
-## zip-it-and-ship-it runs without error when loading json config files
+## functions can have a config with different parameters passed to zip-it-and-ship-it
 
 > Snapshot 1
 

packages/build/tests/core/snapshots/tests.js.md

@@ -533,24 +533,9 @@ test.serial('configFileDirectories is passed to zip-it-and-ship-it', async (t) =
   ])
 })
 
-test.serial('internalSrcFolder is passed to zip-it-and-ship-it', async (t) => {
+test.serial('functions can have a config with different parameters passed to zip-it-and-ship-it', async (t) => {
   const zipItAndShipItSpy = sinon.spy(zipItAndShipIt, 'zipFunctions')
-
-  await new Fixture('./fixtures/functions_internal_src_folder').withFlags({ mode: 'buildbot' }).runWithBuild()
-  zipItAndShipItSpy.restore()
-  const { args: call1Args } = zipItAndShipItSpy.getCall(0)
-
-  const { internalSrcFolder, manifest } = call1Args[2]
-  const { functions } = await importJsonFile(manifest)
-
-  t.is(internalSrcFolder, join(FIXTURES_DIR, 'functions_internal_src_folder/.netlify/functions-internal'))
-  t.is(functions[0].isInternal, true)
-  t.is(functions[1].isInternal, false)
-})
-
-test.serial('functions can have a config with name passed to zip-it-and-ship-it', async (t) => {
-  const zipItAndShipItSpy = sinon.spy(zipItAndShipIt, 'zipFunctions')
-  await new Fixture('./fixtures/functions_display_name')
+  const output = await new Fixture('./fixtures/functions_config_json')
     .withFlags({
       mode: 'buildbot',
       featureFlags: { project_deploy_configuration_api_use_per_function_configuration_files: true },
@@ -563,16 +548,9 @@ test.serial('functions can have a config with name passed to zip-it-and-ship-it'
   const { functions: functions } = await importJsonFile(call1Args[2].manifest)
 
   t.is(functions[0].displayName, 'Function One')
+  t.is(functions[0].generator, '@netlify/[email protected]')
   t.is(functions[1].displayName, undefined)
-})
 
-test.serial('zip-it-and-ship-it runs without error when loading json config files', async (t) => {
-  const output = await new Fixture('./fixtures/functions_config_json')
-    .withFlags({
-      mode: 'buildbot',
-      featureFlags: { project_deploy_configuration_api_use_per_function_configuration_files: true },
-    })
-    .runWithBuild()
   t.snapshot(normalizeOutput(output))
 })
 

packages/build/tests/core/snapshots/tests.js.snap

@@ -50,7 +50,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@netlify/zip-it-and-ship-it": "^8.6.0",
+    "@netlify/zip-it-and-ship-it": "^8.7.0",
     "cpy": "^8.1.0",
     "path-exists": "^5.0.0"
   },