@pbvision/fastify-firestore-service 0.0.15 → 0.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pbvision/fastify-firestore-service",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "Web Framework using Fastify and Firestore ORM",
   "license": "Apache-2.0",
   "type": "module",

package/test/base-test.js

@@ -5,8 +5,14 @@ import { BaseTest, runTests } from '@pbvision/jest-unit-test'
 import superagentDefaults from 'superagent-defaults'
 import supertest from 'supertest'
 
+import fetchWrapper from '../src/fetch-wrapper.js'
+
 let FASTIFY_CACHE
 
+beforeAll(() => {
+  fetchWrapper.__mock = mockNodeFetch()
+})
+
 afterAll(async () => {
   await FASTIFY_CACHE?.close()
   FASTIFY_CACHE = undefined
@@ -18,6 +24,11 @@ class BaseAppTest extends BaseTest {
     return func
   }
 
+  beforeEach () {
+    this.fetchMock = fetchWrapper.__mock
+    fetchWrapper.__mock.mockClear()
+  }
+
   async beforeAll () {
     const makeService = await this.getMakeServiceFunc()
     this.fastify = FASTIFY_CACHE ?? await makeService()
@@ -60,7 +71,7 @@ function makeHeadersObj (headers) {
 
 // the promise input conveniently matches the promise produced by supertest
 // so you can pass the output of app.post(), etc. as the promise here as is
-function makeGotMockValueFromPromise (promise) {
+function makeNodeFetchMockValueFromPromise (promise) {
   const mockValue = new Promise(resolve => {
     promise.then(desiredHttpResponse => {
       let body = desiredHttpResponse.text || desiredHttpResponse.body || ''
@@ -79,11 +90,11 @@ function makeGotMockValueFromPromise (promise) {
   return mockValue
 }
 
-function makeGotMockValue (body, status, callback) {
+function makeNodeFetchMockValue (body, status, callback) {
   const mockValue = new Promise(resolve => {
     // setTimeout is used so that this promise does not synchronously resolve
-    // because unmocked got will NEVER return synchronously. This ensures
-    // functions which call got() never resolve synchronously (which can
+    // because unmocked fetch will NEVER return synchronously. This ensures
+    // functions which call fetch() never resolve synchronously (which can
     // change their behavior... e.g., allow them to throw when called,
     // instead of only rejecting later when await'ed).
     // https://github.com/facebook/jest/issues/6028 (since jest 21.x)
@@ -114,7 +125,7 @@ function mockNodeFetch () {
   })
 
   nodeFetchMock.mockResp = (body = '', statusCode = 200, callback) => {
-    nodeFetchMock.mockReturnValue(makeGotMockValue(body, statusCode, callback))
+    nodeFetchMock.mockReturnValue(makeNodeFetchMockValue(body, statusCode, callback))
   }
 
   /**
@@ -126,24 +137,23 @@ function mockNodeFetch () {
    */
   nodeFetchMock.mockRespWithCallback = (...callbacks) => {
     nodeFetchMock.mockImplementation(request => {
-      const { url, ...options } = request
       for (const callback of callbacks) {
         const desiredHTTPResponse = callback(request)
         if (desiredHTTPResponse === true) {
-          const unmockedGot = jest.requireActual('../src/got')
-          return unmockedGot(url, options)
+          const unmockedFetch = jest.requireActual('../src/fetch-wrapper.js')
+          return unmockedFetch(request)
         }
         if (desiredHTTPResponse) {
           if (desiredHTTPResponse.then) {
-            return makeGotMockValueFromPromise(desiredHTTPResponse)
+            return makeNodeFetchMockValueFromPromise(desiredHTTPResponse)
           }
-          return makeGotMockValue(
+          return makeNodeFetchMockValue(
             // follows the names from supertest
             desiredHTTPResponse.text || desiredHTTPResponse.body || '',
             desiredHTTPResponse.status || 200)
         }
       }
-      throw new Error(`un-mocked got() request: ${JSON.stringify(request)}`)
+      throw new Error(`un-mocked fetchWrapper() request: ${JSON.stringify(request)}`)
     })
   }
 
@@ -167,6 +177,5 @@ function mockNodeFetch () {
 export {
   BaseAppTest,
   BaseTest,
-  mockNodeFetch,
   runTests
 }