Merge branch 'main' into refactor/replace-got/v2-api.test.ts

netlify · Dec 13, 2023 · 3f4463c · 3f4463c
2 parents 3c33ebb + ef7e6db
commit 3f4463c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 29 deletions.
diff --git a/tests/integration/commands/dev/scheduled-functions.test.ts b/tests/integration/commands/dev/scheduled-functions.test.ts
@@ -1,27 +1,23 @@
 import { describe, expect, test } from 'vitest'
 
 import { FixtureTestContext, setupFixtureTests } from '../../utils/fixture.js'
-import got from '../../utils/got.js'
+import fetch from 'node-fetch'
 import { pause } from '../../utils/pause.js'
 
 describe('scheduled functions', () => {
   setupFixtureTests('dev-server-with-functions', { devServer: true }, () => {
     test<FixtureTestContext>('should emulate next_run for scheduled functions', async ({ devServer }) => {
-      const response = await got(`http://localhost:${devServer.port}/.netlify/functions/scheduled-isc`, {
-        throwHttpErrors: false,
-        retry: { limit: 0 },
-      })
+      const response = await fetch(`http://localhost:${devServer.port}/.netlify/functions/scheduled-isc`, {})
 
-      expect(response.statusCode).toBe(200)
+      expect(response.status).toBe(200)
     })
   })
 
   setupFixtureTests('dev-server-with-functions', { devServer: true }, () => {
     test<FixtureTestContext>('should detect file changes to scheduled function', async ({ devServer, fixture }) => {
-      const { body } = await got(`http://localhost:${devServer.port}/.netlify/functions/ping`, {
-        throwHttpErrors: false,
-        retry: { limit: 0 },
-      })
+      const body = await fetch(`http://localhost:${devServer.port}/.netlify/functions/ping`, {}).then((res) =>
+        res.text(),
+      )
 
       expect(body).toBe('ping')
 
@@ -43,10 +39,9 @@ describe('scheduled functions', () => {
       const DETECT_FILE_CHANGE_DELAY = 500
       await pause(DETECT_FILE_CHANGE_DELAY)
 
-      const { body: warning } = await got(`http://localhost:${devServer.port}/.netlify/functions/ping`, {
-        throwHttpErrors: false,
-        retry: { limit: 0 },
-      })
+      const warning = await fetch(`http://localhost:${devServer.port}/.netlify/functions/ping`, {}).then((res) =>
+        res.text(),
+      )
 
       expect(warning).toContain('Your function returned `body`')
     })

diff --git a/tests/integration/commands/functions-invoke/functions-invoke.test.ts b/tests/integration/commands/functions-invoke/functions-invoke.test.ts
@@ -1,4 +1,4 @@
-import got from 'got'
+import fetch from 'node-fetch'
 import { describe, expect, test } from 'vitest'
 
 import { FixtureTestContext, setupFixtureTests } from '../../utils/fixture.js'
@@ -39,26 +39,25 @@ describe('functions:invoke command', () => {
     )
 
     test.concurrent<FixtureTestContext>('should serve helpful tips and tricks', async ({ devServer, fixture }) => {
-      const plainTextResponse = await got(`http://localhost:${devServer.port}/.netlify/functions/scheduled-isc-body`, {
-        throwHttpErrors: false,
-        retry: { limit: 0 },
-      })
+      const textResponse = await fetch(`http://localhost:${devServer.port}/.netlify/functions/scheduled-isc-body`, {})
+
+      const bodyPlainTextResponse = await textResponse.text()
 
       const youReturnedBodyRegex = /.*Your function returned `body`. Is this an accident\?.*/
-      expect(plainTextResponse.body).toMatch(youReturnedBodyRegex)
-      expect(plainTextResponse.body).toMatch(/.*You performed an HTTP request.*/)
-      expect(plainTextResponse.statusCode).toBe(200)
+      expect(bodyPlainTextResponse).toMatch(youReturnedBodyRegex)
+      expect(bodyPlainTextResponse).toMatch(/.*You performed an HTTP request.*/)
+      expect(textResponse.status).toBe(200)
 
-      const htmlResponse = await got(`http://localhost:${devServer.port}/.netlify/functions/scheduled-isc-body`, {
-        throwHttpErrors: false,
-        retry: { limit: 0 },
+      const htmlResponse = await fetch(`http://localhost:${devServer.port}/.netlify/functions/scheduled-isc-body`, {
         headers: {
           accept: 'text/html',
         },
       })
 
-      expect(htmlResponse.body).toMatch(/.*<link.*/)
-      expect(htmlResponse.statusCode).toBe(200)
+      const BodyHtmlResponse = await htmlResponse.text()
+
+      expect(BodyHtmlResponse).toMatch(/.*<link.*/)
+      expect(htmlResponse.status).toBe(200)
 
       const stdout = await fixture.callCli([
         'functions:invoke',

diff --git a/tests/integration/rules-proxy.test.ts b/tests/integration/rules-proxy.test.ts
@@ -6,7 +6,7 @@ import { afterAll, beforeAll, describe, expect, test } from 'vitest'
 
 import { createRewriter, getWatchers } from '../../src/utils/rules-proxy.js'
 
-import got from './utils/got.js'
+import fetch from 'node-fetch'
 import { createSiteBuilder, SiteBuilder } from './utils/site-builder.ts'
 
 describe('rules-proxy', () => {
@@ -48,7 +48,9 @@ describe('rules-proxy', () => {
   })
 
   test('should apply re-write rule based on _redirects file', async () => {
-    const response = await got(`http://localhost:${(server?.address() as net.AddressInfo).port}/something`).json()
+    const response = await fetch(`http://localhost:${(server?.address() as net.AddressInfo).port}/something`).then(
+      (res) => res.json(),
+    )
 
     expect(response.from).toBe('/something')
     expect(response.to).toBe('/ping')