fix: Upgraded Chai, Sinon and other test dependencies (#938)

* change: Upgraded Firestore dependency to v4

* Upgrading Chai and associated dependencies

* Upgraded Sinon; Fixed affected unit and integration tests

* Fixed a series of TS compilation issues in tests

* Extracted test helper function

* fix: Updated some error checks to use deep.include

Author: hiranya911

package-lock.json

@@ -70,7 +70,7 @@
     "@firebase/auth-types": "^0.9.3",
     "@types/bcrypt": "^2.0.0",
     "@types/chai": "^4.0.0",
-    "@types/chai-as-promised": "0.0.29",
+    "@types/chai-as-promised": "^7.1.0",
     "@types/firebase-token-generator": "^2.0.28",
     "@types/jsonwebtoken": "^7.2.8",
     "@types/lodash": "^4.14.104",
@@ -79,13 +79,13 @@
     "@types/nock": "^9.1.0",
     "@types/request": "^2.47.0",
     "@types/request-promise": "^4.1.41",
-    "@types/sinon": "^4.1.3",
-    "@types/sinon-chai": "^2.7.31",
+    "@types/sinon": "^9.0.0",
+    "@types/sinon-chai": "^3.0.0",
     "@typescript-eslint/eslint-plugin": "^2.20.0",
     "@typescript-eslint/parser": "^2.20.0",
     "bcrypt": "^3.0.6",
-    "chai": "^3.5.0",
-    "chai-as-promised": "^6.0.0",
+    "chai": "^4.2.0",
+    "chai-as-promised": "^7.0.0",
     "chalk": "^1.1.3",
     "child-process-promise": "^2.2.1",
     "del": "^2.2.1",
@@ -107,8 +107,8 @@
     "request": "^2.75.0",
     "request-promise": "^4.1.1",
     "run-sequence": "^1.1.5",
-    "sinon": "^4.5.0",
-    "sinon-chai": "^2.14.0",
+    "sinon": "^9.0.0",
+    "sinon-chai": "^3.0.0",
     "ts-node": "^3.3.0",
     "typedoc": "^0.15.0",
     "typescript": "^3.7.3",

package.json

@@ -246,7 +246,7 @@ describe('admin.machineLearning', () => {
           modelOptions.tfliteModel!.gcsTfliteUri = fileName;
           return createTemporaryModel(modelOptions)
             .then((createdModel) => {
-              expect(createdModel.validationError).to.be.empty;
+              expect(createdModel.validationError).to.be.undefined;
               expect(createdModel.published).to.be.false;
               return admin.machineLearning().publishModel(createdModel.modelId)
                 .then((publishedModel) => {
@@ -281,7 +281,7 @@ describe('admin.machineLearning', () => {
           modelOptions.tfliteModel!.gcsTfliteUri = fileName;
           return createTemporaryModel(modelOptions)
             .then((createdModel) => {
-              expect(createdModel.validationError).to.be.empty;
+              expect(createdModel.validationError).to.be.undefined;
               expect(createdModel.published).to.be.false;
               return admin.machineLearning().publishModel(createdModel.modelId)
                 .then((publishedModel) => {
@@ -362,15 +362,15 @@ describe('admin.machineLearning', () => {
           expect(modelList.models.length).to.be.at.least(2);
           expect(modelList.models).to.deep.include(model1);
           expect(modelList.models).to.deep.include(model2);
-          expect(modelList.pageToken).to.be.empty;
+          expect(modelList.pageToken).to.be.undefined;
         });
     });
 
     it('respects page size', () => {
       return admin.machineLearning().listModels({ pageSize: 2 })
         .then((modelList) => {
           expect(modelList.models.length).to.equal(2);
-          expect(modelList.pageToken).not.to.be.empty;
+          expect(modelList.pageToken).not.to.be.undefined;
         });
     });
 
@@ -379,7 +379,7 @@ describe('admin.machineLearning', () => {
         .then((modelList) => {
           expect(modelList.models.length).to.equal(1);
           expect(modelList.models[0]).to.deep.equal(model1);
-          expect(modelList.pageToken).to.be.empty;
+          expect(modelList.pageToken).to.be.undefined;
         });
     });
 
@@ -390,7 +390,7 @@ describe('admin.machineLearning', () => {
           expect(modelList.models).to.deep.include(model1);
           expect(modelList.models).to.deep.include(model2);
           expect(modelList.models).to.deep.include(model3);
-          expect(modelList.pageToken).to.be.empty;
+          expect(modelList.pageToken).to.be.undefined;
         });
     });
 
@@ -401,7 +401,7 @@ describe('admin.machineLearning', () => {
           expect(modelList.models).to.deep.include(model1);
           expect(modelList.models).to.deep.include(model2);
           expect(modelList.models).to.deep.include(model3);
-          expect(modelList.pageToken).to.be.empty;
+          expect(modelList.pageToken).to.be.undefined;
         });
     });
 
@@ -416,7 +416,7 @@ describe('admin.machineLearning', () => {
             pageToken: modelList.pageToken })
             .then((modelList2) => {
               expect(modelList2.models.length).to.be.at.least(1);
-              expect(modelList2.pageToken).to.be.empty;
+              expect(modelList2.pageToken).to.be.undefined;
             });
         });
     });
@@ -425,7 +425,7 @@ describe('admin.machineLearning', () => {
       return admin.machineLearning().listModels({ filter: 'displayName=non-existing-model' })
         .then((modelList) => {
           expect(modelList.models.length).to.equal(0);
-          expect(modelList.pageToken).to.be.empty;
+          expect(modelList.pageToken).to.be.undefined;
         });
     });
 
@@ -490,10 +490,10 @@ describe('admin.machineLearning', () => {
 function verifyTfliteModel(model: admin.machineLearning.Model, expectedGcsTfliteUri: string): void {
   expect(model.tfliteModel!.gcsTfliteUri).to.equal(expectedGcsTfliteUri);
   if (expectedGcsTfliteUri.endsWith('invalid_model.tflite')) {
-    expect(model.modelHash).to.be.empty;
+    expect(model.modelHash).to.be.undefined;
     expect(model.validationError).to.equal('Invalid flatbuffer format');
   } else {
-    expect(model.modelHash).to.not.be.empty;
-    expect(model.validationError).to.be.empty;
+    expect(model.modelHash).to.not.be.undefined;
+    expect(model.validationError).to.be.undefined;
   }
 }