chore: update tests

netlify · Oct 31, 2023 · 3a24dfa · 3a24dfa
1 parent f0ea58b
commit 3a24dfa
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 16 deletions.
diff --git a/tests/integration/__fixtures__/dev-server-with-edge-functions-and-npm-modules/netlify.toml b/tests/integration/__fixtures__/dev-server-with-edge-functions-and-npm-modules/netlify.toml
@@ -0,0 +1,2 @@
+[build]
+publish = "public"
diff --git a/...functions/netlify/edge-functions/blobs.ts → ...m-modules/netlify/edge-functions/blobs.ts b/...functions/netlify/edge-functions/blobs.ts → ...m-modules/netlify/edge-functions/blobs.ts
diff --git a/...ver-with-edge-functions/package-lock.json → ...nctions-and-npm-modules/package-lock.json b/...ver-with-edge-functions/package-lock.json → ...nctions-and-npm-modules/package-lock.json
diff --git a/...v-server-with-edge-functions/package.json → ...ge-functions-and-npm-modules/package.json b/...v-server-with-edge-functions/package.json → ...ge-functions-and-npm-modules/package.json
diff --git a/...gration/__fixtures__/dev-server-with-edge-functions-and-npm-modules/public/ordertest.html b/...gration/__fixtures__/dev-server-with-edge-functions-and-npm-modules/public/ordertest.html
@@ -0,0 +1 @@
+origin
diff --git a/tests/integration/commands/dev/edge-functions.test.ts b/tests/integration/commands/dev/edge-functions.test.ts
@@ -36,7 +36,7 @@ const setup = async ({ fixture }) => {
 }
 
 describe.skipIf(isWindows)('edge functions', () => {
-  setupFixtureTests('dev-server-with-edge-functions', { devServer: true, mockApi: { routes }, setup }, () => {
+  setupFixtureTests('dev-server-with-edge-functions', { devServer: true, mockApi: { routes } }, () => {
     test<FixtureTestContext>('should run edge functions in correct order', async ({ devServer }) => {
       const response = await got(`http://localhost:${devServer.port}/ordertest`, {
         throwHttpErrors: false,
@@ -120,21 +120,6 @@ describe.skipIf(isWindows)('edge functions', () => {
 
       expect(res2.body).toContain('<p>An unhandled error in the function code triggered the following message:</p>')
     })
-
-    test<FixtureTestContext>('should run an edge function that uses the Blobs npm module', async ({ devServer }) => {
-      const res = await got(`http://localhost:${devServer.port}/blobs`, {
-        method: 'GET',
-        throwHttpErrors: false,
-        retry: { limit: 0 },
-      })
-
-      expect(res.statusCode).toBe(200)
-      expect(JSON.parse(res.body)).toEqual({
-        data: 'hello world',
-        fresh: false,
-        metadata: { name: 'Netlify', features: { blobs: true, functions: true } },
-      })
-    })
   })
 
   setupFixtureTests('dev-server-with-edge-functions', { devServer: true, mockApi: { routes } }, () => {
@@ -155,4 +140,25 @@ describe.skipIf(isWindows)('edge functions', () => {
       expect(devServer.output).not.toContain('Removed edge function')
     })
   })
+
+  setupFixtureTests(
+    'dev-server-with-edge-functions-and-npm-modules',
+    { devServer: true, mockApi: { routes }, setup },
+    () => {
+      test<FixtureTestContext>('should run an edge function that uses the Blobs npm module', async ({ devServer }) => {
+        const res = await got(`http://localhost:${devServer.port}/blobs`, {
+          method: 'GET',
+          throwHttpErrors: false,
+          retry: { limit: 0 },
+        })
+
+        expect(res.statusCode).toBe(200)
+        expect(JSON.parse(res.body)).toEqual({
+          data: 'hello world',
+          fresh: false,
+          metadata: { name: 'Netlify', features: { blobs: true, functions: true } },
+        })
+      })
+    },
+  )
 })