fixed tests

src/index.d.ts

@@ -5322,7 +5322,7 @@ declare namespace admin.machineLearning {
      *     token. For the last page, an empty list of models and no page token
      * are returned.
      */
-    listModels(options: ListModelOptions): Promise<ListModelsResult>;
+    listModels(options?: ListModelOptions): Promise<ListModelsResult>;
 
     /**
      * Deletes a model from Firebase ML.

src/machine-learning/machine-learning-api-client.ts

@@ -214,7 +214,6 @@ export class MachineLearningApiClient {
         return resp.data as T;
       })
       .catch((err) => {
-        //console.log(`SendRequest got error: ${JSON.stringify(err)}`);
         throw this.toFirebaseError(err);
       });
   }

src/machine-learning/machine-learning.ts

@@ -154,15 +154,20 @@ export class MachineLearning implements FirebaseServiceInterface {
    *     token. For the last page, an empty list of models and no page token are
    *     returned.
    */
-  public listModels(options: ListModelsOptions): Promise<ListModelsResult> {
+  public listModels(options: ListModelsOptions = {}): Promise<ListModelsResult> {
      return this.client.listModels(options)
       .then((resp) => {
+        if (resp == null) {
+          throw new FirebaseMachineLearningError(
+            'invalid-argument',
+            `Invalid ListModels response: ${JSON.stringify(resp)}`);
+        }
         let models: Model[] = [];
-        if (resp.models) {
+        if (resp && resp.models) {
           models = resp.models.map((rs) =>  new Model(rs));
         }
         const result: ListModelsResult = {models};
-        if (resp.nextPageToken) {
+        if (resp && resp.nextPageToken) {
           result.pageToken = resp.nextPageToken;
         }
         return result;

test/integration/machine-learning.spec.ts

@@ -192,7 +192,7 @@ describe('admin.machineLearning', () => {
     });
 
     it('updates the tflite file', () => {
-      Promise.all([
+      return Promise.all([
           createTemporaryModel(),
           uploadModelToGcs('model1.tflite', 'valid_model.tflite')])
         .then(([model, fileName]) => {
@@ -326,7 +326,7 @@ describe('admin.machineLearning', () => {
 
   describe('listModels()', () => {
     it('resolves with a list of models', () => {
-      Promise.all([
+      return Promise.all([
         createTemporaryModel({displayName: 'node-integration-list1a'}),
         createTemporaryModel({displayName: 'node-integration-list1b'}),
       ])
@@ -338,14 +338,11 @@ describe('admin.machineLearning', () => {
             expect(modelList.models).to.deep.include(model2);
             expect(modelList.pageToken).to.be.empty;
           });
-      })
-      .catch((err) => {
-        throw err;
       });
     });
 
     it('respects page size', () => {
-      Promise.all([
+      return Promise.all([
         createTemporaryModel({displayName: 'node-integration-list2a'}),
         createTemporaryModel({displayName: 'node-integration-list2b'}),
         createTemporaryModel({displayName: 'node-integration-list2c'}),
@@ -356,9 +353,6 @@ describe('admin.machineLearning', () => {
             expect(modelList.models.length).to.equal(2);
             expect(modelList.pageToken).not.to.be.empty;
           });
-      })
-      .catch((err) => {
-        throw err;
       });
     });
 
@@ -375,7 +369,7 @@ describe('admin.machineLearning', () => {
     });
 
     it('filters by displayName prefix', () => {
-      Promise.all([
+      return Promise.all([
         createTemporaryModel({displayName: 'node-integration-list4a'}),
         createTemporaryModel({displayName: 'node-integration-list4b'}),
         createTemporaryModel({displayName: 'node-integration-list4c'}),
@@ -389,14 +383,11 @@ describe('admin.machineLearning', () => {
             expect(modelList.models).to.deep.include(model3);
             expect(modelList.pageToken).to.be.empty;
           });
-      })
-      .catch((err) => {
-        throw err;
       });
     });
 
     it('filters by tag', () => {
-      Promise.all([
+      return Promise.all([
         createTemporaryModel({displayName: 'node-integration-list5a', tags: ['node-integration-tag5']}),
         createTemporaryModel({displayName: 'node-integration-list5b', tags: ['node-integration-tag5']}),
         createTemporaryModel({displayName: 'node-integration-list5c', tags: ['node-integration-tag5']}),
@@ -410,14 +401,11 @@ describe('admin.machineLearning', () => {
             expect(modelList.models).to.deep.include(model3);
             expect(modelList.pageToken).to.be.empty;
           });
-      })
-      .catch((err) => {
-        throw err;
       });
     });
 
     it('handles pageTokens properly', () => {
-      Promise.all([
+      return Promise.all([
         createTemporaryModel({displayName: 'node-integration-list6a'}),
         createTemporaryModel({displayName: 'node-integration-list6b'}),
         createTemporaryModel({displayName: 'node-integration-list6c'}),
@@ -427,31 +415,31 @@ describe('admin.machineLearning', () => {
           .then((modelList) => {
             expect(modelList.models.length).to.equal(2);
             expect(modelList.pageToken).not.to.be.empty;
-            return admin.machineLearning().listModels({pageToken: modelList.pageToken, pageSize: 10})
+            return admin.machineLearning().listModels({
+              filter: 'displayName:node-integration-list6*',
+              pageSize: 2,
+              pageToken: modelList.pageToken})
               .then((modelList2) => {
                 expect(modelList2.models.length).to.be.at.least(1);
                 expect(modelList2.pageToken).to.be.empty;
-              })
-              .catch((err) => {
-                throw err;
               });
           });
-      })
-      .catch((err) => {
-        throw err;
       });
     });
 
     it('successfully returns an empty list of models', () => {
-      return admin.machineLearning().listModels({filter: 'displayName=non-existing-node-integration-model'})
+      return admin.machineLearning().listModels({filter: 'displayName=non-existing-model'})
         .then((modelList) => {
           expect(modelList.models.length).to.equal(0);
           expect(modelList.pageToken).to.be.empty;
-        })
-        .catch((err) => {
-          throw err;
         });
     });
+
+    it('rejects with invalid argument if the filter is invalid', () => {
+      return admin.machineLearning().listModels({filter: 'invalidFilterItem=foo'})
+        .should.eventually.be.rejected.and.have.property(
+          'code', 'machine-learning/invalid-argument');
+    });
   });
 
   describe('deleteModel()', () => {

test/unit/machine-learning/machine-learning-api-client.spec.ts

@@ -454,9 +454,10 @@ describe('MachineLearningApiClient', () => {
         stubs.push(stub);
         return apiClient.listModels(options)
           .then((resp) => {
-            expect(resp.models.length).to.equal(2);
-            expect(resp.models[0]).to.deep.equal(MODEL_RESPONSE);
-            expect(resp.models[1]).to.deep.equal(MODEL_RESPONSE2);
+            expect(resp.models).not.to.be.empty;
+            expect(resp.models!.length).to.equal(2);
+            expect(resp.models![0]).to.deep.equal(MODEL_RESPONSE);
+            expect(resp.models![1]).to.deep.equal(MODEL_RESPONSE2);
             expect(stub).to.have.been.calledOnce.and.calledWith({
               method: 'GET',
               url: `${BASE_URL}/projects/test-project/models`,

test/unit/machine-learning/machine-learning.spec.ts

@@ -364,29 +364,17 @@ describe('MachineLearning', () => {
         .stub(MachineLearningApiClient.prototype, 'listModels')
         .resolves(null);
       stubs.push(stub);
-      return machineLearning.listModels({})
+      return machineLearning.listModels()
         .should.eventually.be.rejected.and.have.property(
           'message', 'Invalid ListModels response: null');
     });
 
-    it('should reject when API response does not contain models', () => {
-      const response: any = deepCopy(LIST_MODELS_RESPONSE);
-      response.models = '';
-      const stub = sinon
-        .stub(MachineLearningApiClient.prototype, 'listModels')
-        .resolves(response);
-      stubs.push(stub);
-      return machineLearning.listModels({})
-        .should.eventually.be.rejected.and.have.property(
-          'message', `Invalid ListModels response: ${JSON.stringify(response)}`);
-    });
-
     it('should resolve with Models on success', () => {
       const stub = sinon
         .stub(MachineLearningApiClient.prototype, 'listModels')
         .resolves(LIST_MODELS_RESPONSE);
       stubs.push(stub);
-      return machineLearning.listModels({})
+      return machineLearning.listModels()
         .then((result) => {
           expect(result.models.length).equals(2);
           expect(result.models[0]).to.deep.equal(MODEL1);