upgrade sinon and fix a few usages (#3040)

Co-authored-by: huangjeff5 <[email protected]>

Author: bkendall

package-lock.json

@@ -162,7 +162,7 @@
     "@types/request": "^2.48.1",
     "@types/rimraf": "^2.0.3",
     "@types/semver": "^6.0.0",
-    "@types/sinon": "^5.0.5",
+    "@types/sinon": "^9.0.10",
     "@types/sinon-chai": "^3.2.2",
     "@types/supertest": "^2.0.6",
     "@types/tar": "^4.0.0",
@@ -194,7 +194,7 @@
     "openapi-merge": "^1.0.23",
     "prettier": "^2.2.1",
     "proxy": "^1.0.2",
-    "sinon": "^6.3.4",
+    "sinon": "^9.2.3",
     "sinon-chai": "^3.2.0",
     "source-map-support": "^0.5.9",
     "supertest": "^3.3.0",

package.json

@@ -76,6 +76,9 @@ describe("distribution", () => {
       it("should throw error when retry count >= AppDistributionClient.MAX_POLLING_RETRIES", () => {
         sandbox.stub(appDistributionClient, "getUploadStatus").resolves({
           status: UploadStatus.IN_PROGRESS,
+          message: "",
+          errorCode: "",
+          release: { id: "" },
         });
         return expect(
           appDistributionClient.pollUploadStatus(
@@ -93,6 +96,8 @@ describe("distribution", () => {
       const releaseId = "fake-release-id";
       sandbox.stub(appDistributionClient, "getUploadStatus").resolves({
         status: UploadStatus.SUCCESS,
+        message: "",
+        errorCode: "",
         release: {
           id: releaseId,
         },

src/test/appdistro/client.spec.ts

@@ -8,6 +8,7 @@ import * as resolveSource from "../../extensions/resolveSource";
 import { storage } from "../../gcp";
 import * as archiveDirectory from "../../archiveDirectory";
 import * as prompt from "../../prompt";
+import { ExtensionSource } from "../../extensions/extensionsApi";
 
 describe("extensionsHelper", () => {
   describe("substituteParams", () => {
@@ -687,12 +688,14 @@ describe("extensionsHelper", () => {
     let createSourceStub: sinon.SinonStub;
     let deleteStub: sinon.SinonStub;
     const testUrl = "https://storage.googleapis.com/firebase-ext-eap-uploads/object.zip";
-    const testSource = {
+    const testSource: ExtensionSource = {
       name: "test",
       packageUri: testUrl,
       hash: "abc123",
+      state: "ACTIVE",
       spec: {
         name: "projects/test-proj/sources/abc123",
+        version: "0.0.0",
         sourceUrl: testUrl,
         resources: [],
       },
@@ -775,12 +778,14 @@ describe("extensionsHelper", () => {
         "0.1.1": testOnePlatformSourceName,
       },
     };
-    const testSource = {
+    const testSource: ExtensionSource = {
       name: "test",
       packageUri: "",
       hash: "abc123",
+      state: "ACTIVE",
       spec: {
         name: "",
+        version: "0.0.0",
         sourceUrl: "",
         resources: [],
       },

src/test/extensions/extensionsHelper.spec.ts

@@ -47,7 +47,7 @@ describe("checkForUpdateWarnings", () => {
   let confirmUpdateWarningSpy: sinon.SinonStub;
 
   beforeEach(() => {
-    confirmUpdateWarningSpy = sinon.stub(resolveSource, "confirmUpdateWarning").resolves(true);
+    confirmUpdateWarningSpy = sinon.stub(resolveSource, "confirmUpdateWarning").resolves();
   });
 
   afterEach(() => {