integration framework: request -> node-fetch (#2787)

* request -> fetch * statusCode -> status * await on the response data
firebase · Nov 11, 2020 · cd6e7ef · cd6e7ef
1 parent 50a2aab
commit cd6e7ef
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 20 deletions.
diff --git a/scripts/extensions-emulator-tests/tests.ts b/scripts/extensions-emulator-tests/tests.ts
@@ -56,7 +56,7 @@ describe("extension emulator", () => {
 
     const res = await test.invokeHttpFunction(TEST_FUNCTION_NAME, FIREBASE_PROJECT_ZONE);
 
-    expect(res.statusCode).to.equal(200);
-    expect(res.body).to.equal("Hello World from greet-the-world");
+    expect(res.status).to.equal(200);
+    await expect(res.text()).to.eventually.equal("Hello World from greet-the-world");
   });
 });
diff --git a/scripts/integration-helpers/framework.ts b/scripts/integration-helpers/framework.ts
@@ -1,4 +1,4 @@
-import * as request from "request";
+import fetch, { Response } from "node-fetch";
 
 import { CLIProcess } from "./cli";
 
@@ -124,35 +124,30 @@ export class TriggerEndToEndTest {
     return this.cliProcess ? this.cliProcess.stop() : Promise.resolve();
   }
 
-  invokeHttpFunction(name: string, zone = FIREBASE_PROJECT_ZONE): Promise<request.Response> {
+  invokeHttpFunction(name: string, zone = FIREBASE_PROJECT_ZONE): Promise<Response> {
     const url = `http://localhost:${[this.functionsEmulatorPort, this.project, zone, name].join(
       "/"
     )}`;
-    return new Promise((resolve, reject) => {
-      request.get(url, {}, (err, res) => {
-        if (err) return reject(err);
-        resolve(res);
-      });
-    });
+    return fetch(url);
   }
 
-  writeToRtdb(): Promise<request.Response> {
+  writeToRtdb(): Promise<Response> {
     return this.invokeHttpFunction("writeToRtdb");
   }
 
-  writeToFirestore(): Promise<request.Response> {
+  writeToFirestore(): Promise<Response> {
     return this.invokeHttpFunction("writeToFirestore");
   }
 
-  writeToPubsub(): Promise<request.Response> {
+  writeToPubsub(): Promise<Response> {
     return this.invokeHttpFunction("writeToPubsub");
   }
 
-  writeToAuth(): Promise<request.Response> {
+  writeToAuth(): Promise<Response> {
     return this.invokeHttpFunction("writeToAuth");
   }
 
-  writeToScheduledPubsub(): Promise<request.Response> {
+  writeToScheduledPubsub(): Promise<Response> {
     return this.invokeHttpFunction("writeToScheduledPubsub");
   }
 

diff --git a/scripts/triggers-end-to-end-tests/tests.ts b/scripts/triggers-end-to-end-tests/tests.ts
@@ -137,15 +137,15 @@ describe("database and firestore emulator function triggers", () => {
     this.timeout(EMULATOR_TEST_TIMEOUT);
 
     const response = await test.writeToRtdb();
-    expect(response.statusCode).to.equal(200);
+    expect(response.status).to.equal(200);
   });
 
   it("should write to the firestore emulator", async function() {
     // eslint-disable-next-line no-invalid-this
     this.timeout(EMULATOR_TEST_TIMEOUT);
 
     const response = await test.writeToFirestore();
-    expect(response.statusCode).to.equal(200);
+    expect(response.status).to.equal(200);
 
     /*
      * We delay again here because the functions triggered
@@ -193,7 +193,7 @@ describe("pubsub emulator function triggers", () => {
     this.timeout(EMULATOR_TEST_TIMEOUT);
 
     const response = await test.writeToPubsub();
-    expect(response.statusCode).to.equal(200);
+    expect(response.status).to.equal(200);
     await new Promise((resolve) => setTimeout(resolve, EMULATORS_WRITE_DELAY_MS));
   });
 
@@ -206,7 +206,7 @@ describe("pubsub emulator function triggers", () => {
     this.timeout(EMULATOR_TEST_TIMEOUT);
 
     const response = await test.writeToScheduledPubsub();
-    expect(response.statusCode).to.equal(200);
+    expect(response.status).to.equal(200);
     await new Promise((resolve) => setTimeout(resolve, EMULATORS_WRITE_DELAY_MS));
   });
 
@@ -246,7 +246,7 @@ describe("auth emulator function triggers", () => {
     }
 
     const response = await test.writeToAuth();
-    expect(response.statusCode).to.equal(200);
+    expect(response.status).to.equal(200);
     await new Promise((resolve) => setTimeout(resolve, EMULATORS_WRITE_DELAY_MS));
   });