Fix deprecations

Esri · Feb 14, 2022 · 9575641 · 9575641
1 parent f7e4d95
commit 9575641
Show file tree

Hide file tree

Showing 10 changed files with 252 additions and 97 deletions.
diff --git a/jasmine.json b/jasmine.json
@@ -3,5 +3,6 @@
   "spec_files": ["*/test/**/*.test.ts"],
   "helpers": ["../support/test-helpers.js"],
   "stopSpecOnExpectationFailure": false,
-  "random": false
+  "random": true,
+  "verboseDeprecations": true
 }
diff --git a/packages/common/test/restHelpers.test.ts b/packages/common/test/restHelpers.test.ts
@@ -1955,9 +1955,14 @@ describe("Module `restHelpers`: common REST utility functions shared across pack
 
       restHelpers
         .convertExtent(extent, serviceSR, geometryServiceUrl, MOCK_USER_SESSION)
-        .then(_extent => {
-          done.fail();
-        }, done);
+        .then(
+          () => {
+            done.fail();
+          },
+          () => {
+            done();
+          }
+        );
     });
 
     it("can handle unmatched wkid and failure on findTransformations", done => {
@@ -1976,9 +1981,14 @@ describe("Module `restHelpers`: common REST utility functions shared across pack
 
       restHelpers
         .convertExtent(extent, serviceSR, geometryServiceUrl, MOCK_USER_SESSION)
-        .then(_extent => {
-          done.fail();
-        }, done);
+        .then(
+          () => {
+            done.fail();
+          },
+          () => {
+            done();
+          }
+        );
     });
   });
 
@@ -2142,7 +2152,14 @@ describe("Module `restHelpers`: common REST utility functions shared across pack
           geometryServiceUrl,
           MOCK_USER_SESSION
         )
-        .then(done.fail, done);
+        .then(
+          () => {
+            done.fail();
+          },
+          () => {
+            done();
+          }
+        );
     });
   });
 
@@ -3595,7 +3612,14 @@ describe("Module `restHelpers`: common REST utility functions shared across pack
 
       restHelpers
         .updateGroup(grp, MOCK_USER_SESSION)
-        .then(() => done.fail, done);
+        .then(
+          () => {
+            done.fail();
+          },
+          () => {
+            done();
+          }
+        );
     });
   });
 
@@ -4731,7 +4755,14 @@ describe("Module `restHelpers`: common REST utility functions shared across pack
         );
       restHelpers
         ._getCreateServiceOptions(itemTemplate, userSession, templateDictionary)
-        .then(done.fail, done);
+        .then(
+          () => {
+            done.fail();
+          },
+          () => {
+            done();
+          }
+        );
     });
   });
 

diff --git a/packages/common/test/workforceHelpers.test.ts b/packages/common/test/workforceHelpers.test.ts
@@ -44,7 +44,14 @@ describe("Module `workforceHelpers`: manages the creation and deployment of work
     it("will handle no edits", done => {
       workforceHelpers
         ._applyEdits("http://url", [], MOCK_USER_SESSION)
-        .then(done, done.fail);
+        .then(
+          () => {
+            done();
+          },
+          () => {
+            done.fail();
+          }
+        );
     });
   });
   describe("_extractDependencies", () => {
@@ -361,7 +368,14 @@ describe("Module `workforceHelpers`: manages the creation and deployment of work
 
       workforceHelpers
         .getWorkforceServiceInfo(props, url, MOCK_USER_SESSION)
-        .then(() => done.fail, done);
+        .then(
+          () => {
+            done.fail();
+          },
+          () => {
+            done();
+          }
+        );
     });
 
     it("can handle _getAssignmentIntegrationInfos failure", done => {

diff --git a/packages/deployer/test/deploySolutionItems.test.ts b/packages/deployer/test/deploySolutionItems.test.ts
@@ -780,7 +780,14 @@ describe("Module `deploySolutionItems`", () => {
             progressCallback: utils.SOLUTION_PROGRESS_CALLBACK
           }
         )
-        .then(() => done.fail(), done);
+        .then(
+          () => {
+            done.fail();
+          },
+          () => {
+            done();
+          }
+        );
     });
 
     it("can handle error on find items by tag", done => {
@@ -857,7 +864,14 @@ describe("Module `deploySolutionItems`", () => {
             progressCallback: utils.SOLUTION_PROGRESS_CALLBACK
           }
         )
-        .then(() => done.fail(), done);
+        .then(
+          () => {
+            done.fail();
+          },
+          () => {
+            done();
+          }
+        );
     });
 
     it("handles failure to delete all items when unwinding after failure to deploy", done => {
@@ -1152,7 +1166,14 @@ describe("Module `deploySolutionItems`", () => {
             progressCallback: utils.SOLUTION_PROGRESS_CALLBACK
           }
         )
-        .then(() => done.fail(), done);
+        .then(
+          () => {
+            done.fail();
+          },
+          () => {
+            done();
+          }
+        );
     });
 
     it("handle failure to use existing items", done => {
@@ -1231,7 +1252,14 @@ describe("Module `deploySolutionItems`", () => {
             progressCallback: utils.SOLUTION_PROGRESS_CALLBACK
           }
         )
-        .then(() => done.fail(), done);
+        .then(
+          () => {
+            done.fail();
+          },
+          () => {
+            done();
+          }
+        );
     });
   });
 
@@ -2616,7 +2644,14 @@ describe("Module `deploySolutionItems`", () => {
     it("will handle no custom item id requests", done => {
       deploySolution
         ._setTypekeywordForExisting([], {}, MOCK_USER_SESSION)
-        .then(done);
+        .then(
+          () => {
+            done();
+          },
+          () => {
+            done.fail();
+          }
+        );
     });
   });
 });
diff --git a/packages/deployer/test/deployer.test.ts b/packages/deployer/test/deployer.test.ts
@@ -704,9 +704,14 @@ describe("Module `deployer`", () => {
             };
             deployer
               .deploySolution(itemInfo.item.id, MOCK_USER_SESSION, options)
-              .then(done, e => {
-                done.fail(e);
-              });
+              .then(
+                () => {
+                  done();
+                },
+                e => {
+                  done.fail(e);
+                }
+              );
           },
           e => {
             done.fail(e);
@@ -1028,9 +1033,14 @@ describe("Module `deployer`", () => {
 
       deployer
         .deploySolution(itemInfoCard.id, MOCK_USER_SESSION, options)
-        .then(() => {
-          done.fail();
-        }, done);
+        .then(
+          () => {
+            done.fail();
+          },
+          () => {
+            done();
+          }
+        );
     });
 
     it("can handle error on createItemWithData", done => {

diff --git a/packages/feature-layer/test/feature-layer.test.ts b/packages/feature-layer/test/feature-layer.test.ts
@@ -337,9 +337,14 @@ describe("Module `feature-layer`: manages the creation and deployment of feature
           MOCK_USER_SESSION,
           templateDictionary
         )
-        .then(r => {
-          done.fail();
-        }, done);
+        .then(
+          () => {
+            done.fail();
+          },
+          () => {
+            done();
+          }
+        );
     });
 
     it("should handle error on getItemData", done => {
@@ -384,7 +389,14 @@ describe("Module `feature-layer`: manages the creation and deployment of feature
           MOCK_USER_SESSION,
           templateDictionary
         )
-        .then(done, done.fail);
+        .then(
+          () => {
+            done();
+          },
+          e => {
+            done.fail(e);
+          }
+        );
     });
 
     it("should handle error on getServiceLayersAndTables", done => {
@@ -426,9 +438,14 @@ describe("Module `feature-layer`: manages the creation and deployment of feature
           MOCK_USER_SESSION,
           templateDictionary
         )
-        .then(r => {
-          done.fail();
-        }, done);
+        .then(
+          () => {
+            done.fail();
+          },
+          () => {
+            done();
+          }
+        );
     });
   });
 
@@ -2749,7 +2766,14 @@ describe("Module `feature-layer`: manages the creation and deployment of feature
 
       featureLayer
         .postProcess("", "", [], template, [], {}, MOCK_USER_SESSION)
-        .then(done, done.fail);
+        .then(
+          () => {
+            done();
+          },
+          e => {
+            done.fail(e);
+          }
+        );
     });
   });
 });
diff --git a/packages/simple-types/test/oic.test.ts b/packages/simple-types/test/oic.test.ts
@@ -92,33 +92,36 @@ describe("Module `webmap`: manages the creation and deployment of OIC (Oriented
   });
 
   describe("_extractDependencies", () => {
-    it("handles missing data or properties", done => {
+    it("handles missing data or properties", () => {
       const expectedDependencies = {
         dependencies: [] as string[],
         urlHash: {} as any
       };
+      let itemTemplate: common.IItemTemplate;
 
-      oic
-        ._extractDependencies(templates.getItemTemplateSkeleton(), null)
-        .then(actual => {
-          expect(actual).toEqual(expectedDependencies);
-          done();
-        }, done.fail);
+      return oic._extractDependencies(templates.getItemTemplateSkeleton(), null)
+      .then(actual => {
+        expect(actual).toEqual(expectedDependencies);
 
-      const itemTemplate = templates.getItemTemplate(
-        "Oriented Imagery Catalog"
-      );
-      itemTemplate.data.properties = null;
-      oic._extractDependencies(itemTemplate, null).then(actual => {
+        itemTemplate = templates.getItemTemplate(
+          "Oriented Imagery Catalog"
+        );
+        itemTemplate.data.properties = null;
+        return oic._extractDependencies(itemTemplate, null);
+      })
+      .then(actual => {
         expect(actual).toEqual(expectedDependencies);
-        done();
-      }, done.fail);
 
-      itemTemplate.data = null;
-      oic._extractDependencies(itemTemplate, null).then(actual => {
+        itemTemplate.data = null;
+        return oic._extractDependencies(itemTemplate, null);
+      })
+      .then(actual => {
         expect(actual).toEqual(expectedDependencies);
-        done();
-      }, done.fail);
+        return Promise.resolve();
+      })
+      .catch(error => {
+        return Promise.reject(error);
+      });
     });
 
     it("handles both of the URL properties", done => {

diff --git a/packages/simple-types/test/webmappingapplication.test.ts b/packages/simple-types/test/webmappingapplication.test.ts
@@ -1143,9 +1143,14 @@ describe("Module `webmappingapplication`: manages the creation and deployment of
 
       webmappingapplication
         .convertItemToTemplate(infoLookupTemplate, MOCK_USER_SESSION, MOCK_USER_SESSION)
-        .then(template => {
-          done.fail();
-        }, done);
+        .then(
+          () => {
+            done.fail();
+          },
+          () => {
+            done();
+          }
+        );
     });
   });