test: adjust EF deploy tests to not add netlifyConfig configuration and use inline config, also add cases for internal and framework functions

Author: pieh

tests/integration/commands/deploy/deploy.test.ts

@@ -178,11 +178,13 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
         .withNetlifyToml({
           config: {
             build: { publish: 'public', command: 'echo "no op"' },
-            edge_functions: [{ function: 'edge', path: '/*' }],
           },
         })
         .withEdgeFunction({
           handler: async () => new Response('Edge Function works'),
+          config: {
+            path: '/*',
+          },
           name: 'edge',
         })
 
@@ -222,13 +224,15 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
         .withNetlifyToml({
           config: {
             build: { publish: 'public', command: 'echo "no op"' },
-            edge_functions: [{ function: 'edge', path: '/*' }],
           },
           pathPrefix,
         })
         .withEdgeFunction({
           handler: async () => new Response('Edge Function works'),
           name: 'edge',
+          config: {
+            path: '/*',
+          },
           pathPrefix,
         })
 
@@ -256,6 +260,98 @@ describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('co
     })
   })
 
+  test('should deploy integrations Edge Functions when directory exists', async (t) => {
+    await withSiteBuilder(t, async (builder) => {
+      const content = 'Edge Function works NOT'
+      builder
+        .withContentFile({
+          path: 'public/index.html',
+          content,
+        })
+        .withNetlifyToml({
+          config: {
+            build: { publish: 'public', command: 'echo "no op"' },
+          },
+        })
+        .withEdgeFunction({
+          handler: async () => new Response('Edge Function works'),
+          config: {
+            path: '/*',
+          },
+          name: 'edge',
+          path: '.netlify/edge-functions',
+        })
+
+      await builder.build()
+
+      const options = {
+        cwd: builder.directory,
+        env: { NETLIFY_SITE_ID: context.siteId },
+      }
+
+      await callCli(['build'], options)
+      const deploy = await callCli(['deploy', '--json', '--no-build'], options).then((output: string) =>
+        JSON.parse(output),
+      )
+
+      // give edge functions manifest a couple ticks to propagate
+      await pause(500)
+
+      await validateDeploy({
+        deploy,
+        siteName: SITE_NAME,
+        content: 'Edge Function works',
+        contentMessage: 'Edge function did not execute correctly or was not deployed correctly',
+      })
+    })
+  })
+
+  test('should deploy framework Edge Functions when directory exists', async (t) => {
+    await withSiteBuilder(t, async (builder) => {
+      const content = 'Edge Function works NOT'
+      builder
+        .withContentFile({
+          path: 'public/index.html',
+          content,
+        })
+        .withNetlifyToml({
+          config: {
+            build: { publish: 'public', command: 'echo "no op"' },
+          },
+        })
+        .withEdgeFunction({
+          handler: async () => new Response('Edge Function works'),
+          config: {
+            path: '/*',
+          },
+          name: 'edge',
+          path: '.netlify/v1/edge-functions',
+        })
+
+      await builder.build()
+
+      const options = {
+        cwd: builder.directory,
+        env: { NETLIFY_SITE_ID: context.siteId },
+      }
+
+      // skipping running build here, because it cleans up frameworks API directories
+      const deploy = await callCli(['deploy', '--json', '--no-build'], options).then((output: string) =>
+        JSON.parse(output),
+      )
+
+      // give edge functions manifest a couple ticks to propagate
+      await pause(500)
+
+      await validateDeploy({
+        deploy,
+        siteName: SITE_NAME,
+        content: 'Edge Function works',
+        contentMessage: 'Edge function did not execute correctly or was not deployed correctly',
+      })
+    })
+  })
+
   test('runs build command before deploy by default', async (t) => {
     await withSiteBuilder(t, async (builder) => {
       const content = '<h1>⊂◉‿◉つ</h1>'