+tests

tests/endpoints/Catalog.test.js

@@ -13,8 +13,9 @@ test('Test Catalog', async () => {
     }).then((data) => {
         expect(data?.entries).toBeDefined()
         Object.entries(data?.entries).forEach(([key, value]) => {
-            console.log(value?.name)
+            expect(value?.name).toBeDefined()
         });
         console.log(`Returned ${data?.entries?.length} timeseries IDs`)
     })
+
 }, 20000)

tests/endpoints/Pools.test.js

@@ -9,9 +9,15 @@ test('Test Pools', async () => {
         }
     })
     const p_api = new PoolsApi(config)
-    await p_api.getCwmsDataPools({
+    await p_api.getCwmsDataPoolsRaw({
         "office": "SWT"
-    }).then((data) => {
+    })
+    .then(async (r)=> {
+        const data = await r.raw.json()
+        console.log(data)
+        return data
+    })
+    .then((data) => {
             expect(data).toBeDefined()
             // data.forEach((category) => {
             //     expect(category).toBeDefined()

tests/endpoints/Ratings.test.js

@@ -1,33 +1,45 @@
-import { RatingsApi } from "cwmsjs";
-import fetch from 'node-fetch';
+import { RatingsApi, Configuration } from "cwmsjs";
+import fetch from "node-fetch";
 global.fetch = fetch;
 
-test('Test Ratings', async () => {
-   const r_api = new RatingsApi()
-   r_api.getCwmsDataRatings({
-         "office": "SWT"
-    }).then((data) => {
-        expect(data).toBeDefined()
-   })
-   // Fetch the CWMS Rating specification for the SWT OFFICE given a rating mask for keystone lake
-   r_api.getCwmsDataRatingsSpec({
-            "office": "SWT",
-            "ratingIdMask": "KEYS.*"
-        }).then((data) => {
-            expect(data?.specs).toBeDefined()
-        })
-   // Fetch the CWMS Rating templates for the SPK OFFICE
-   r_api.getCwmsDataRatingsTemplate({
-    "office": "SPK"
-   }).then((data) => {
-       expect(data?.templates).toBeDefined()
-   })
+test("Test Ratings", async () => {
+  const config_v2 = new Configuration({
+    headers: {
+      accept: "application/json;version=2",
+    },
+  });
+  const r_api = new RatingsApi(config_v2);
+  await r_api
+    .getCwmsDataRatings({
+      office: "SWT",
+    })
+    .then((data) => {
+      expect(data).toBeDefined();
+    });
+//   Fetch the CWMS Rating specification for the SWT OFFICE given a rating mask for keystone lake
+  await r_api
+    .getCwmsDataRatingsSpec({
+      office: "SWT",
+      ratingIdMask: "KEYS.*",
+    })
+    .then((data) => {
+      expect(data?.specs).toBeDefined();
+    });
+//   Fetch the CWMS Rating templates for the SPK OFFICE
+  await r_api
+    .getCwmsDataRatingsTemplate({
+      office: "SPK",
+    })
+    .then((data) => {
+      expect(data?.templates).toBeDefined();
+    });
 
-   r_api.getCwmsDataRatingsTemplateWithTemplateId({
-    "office": "SWT", 
-     "templateId": "Elev-Alt;Stor-Alt.Linear"
-   }).then(data=> {
-        expect(data).toBeDefined()
-   })
-
-}, 30000)
+//   await r_api
+//     .getCwmsDataRatingsTemplateWithTemplateId({
+//       office: "SWT",
+//       templateId: "Elev-Alt;Stor-Alt.Linear",
+//     })
+//     .then((data) => {
+//       expect(data).toBeDefined();
+//     });
+}, 30000);

tests/package.json

@@ -13,7 +13,7 @@
     },
     "scripts": {
         "jest-modules": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
-        "test": "npm run jest-modules -- --runInBand",
+        "test": "npm run jest-modules --",
         "test-cicd": "npm run jest-modules -- --runInBand --ci --detectOpenHandles",
         "coverage": "npm run test --coverage",
         "link": "cd ../src && npm link && cd ../tests && npm link cwmsjs"