Improve skipping of auth tests

Author: tsmith023

src/connection/journey.test.ts

@@ -9,31 +9,38 @@ import Connection from './index.js';
 import { WeaviateStartUpError } from '../errors.js';
 import weaviate from '../index.js';
 
-describe('connection', () => {
-  it('makes a logged-in request when client host param has trailing slashes', async () => {
-    if (process.env.WCS_DUMMY_CI_PW == undefined || process.env.WCS_DUMMY_CI_PW == '') {
-      console.warn('Skipping because `WCS_DUMMY_CI_PW` is not set');
-      return Promise.resolve();
-    }
-
-    const client = await weaviate.connectToLocal({
-      port: 8085,
-      authCredentials: new AuthUserPasswordCredentials({
-        username: '[email protected]',
-        password: process.env.WCS_DUMMY_CI_PW,
-        silentRefresh: false,
-      }),
-    });
+const check = (cred?: string) => {
+  if (cred == undefined || cred == '') {
+    console.warn('Skipping because `WCS_DUMMY_CI_PW` is not set');
+    return it.skip;
+  } else {
+    return it;
+  }
+};
 
-    return client
-      .getMeta()
-      .then((res) => {
-        expect(res.version).toBeDefined();
-      })
-      .catch((e) => {
-        throw new Error('it should not have errord: ' + e);
+describe('connection', () => {
+  check(process.env.WCS_DUMMY_CI_PW)(
+    'makes a logged-in request when client host param has trailing slashes',
+    async () => {
+      const client = await weaviate.connectToLocal({
+        port: 8085,
+        authCredentials: new AuthUserPasswordCredentials({
+          username: '[email protected]',
+          password: process.env.WCS_DUMMY_CI_PW,
+          silentRefresh: false,
+        }),
       });
-  });
+
+      return client
+        .getMeta()
+        .then((res) => {
+          expect(res.version).toBeDefined();
+        })
+        .catch((e) => {
+          throw new Error('it should not have errord: ' + e);
+        });
+    }
+  );
 
   // it('makes an Azure logged-in request with client credentials', async () => {
   //   if (process.env.AZURE_CLIENT_SECRET == undefined || process.env.AZURE_CLIENT_SECRET == '') {
@@ -59,37 +66,30 @@ describe('connection', () => {
   //     });
   // });
 
-  it('makes an Okta logged-in request with client credentials', async () => {
-    if (process.env.OKTA_CLIENT_SECRET == undefined || process.env.OKTA_CLIENT_SECRET == '') {
-      console.warn('Skipping because `OKTA_CLIENT_SECRET` is not set');
-      return Promise.resolve();
-    }
-
-    const client = await weaviate.connectToLocal({
-      port: 8082,
-      authCredentials: new AuthClientCredentials({
-        clientSecret: process.env.OKTA_CLIENT_SECRET,
-        scopes: ['some_scope'],
-        silentRefresh: false,
-      }),
-    });
-
-    return client
-      .getMeta()
-      .then((res) => {
-        expect(res.version).toBeDefined();
-      })
-      .catch((e) => {
-        throw new Error('it should not have errord: ' + e);
+  check(process.env.OKTA_CLIENT_SECRET)(
+    'makes an Okta logged-in request with client credentials',
+    async () => {
+      const client = await weaviate.connectToLocal({
+        port: 8082,
+        authCredentials: new AuthClientCredentials({
+          clientSecret: process.env.OKTA_CLIENT_SECRET!,
+          scopes: ['some_scope'],
+          silentRefresh: false,
+        }),
       });
-  });
 
-  it('makes an Okta logged-in request with username/password', async () => {
-    if (process.env.OKTA_DUMMY_CI_PW == undefined || process.env.OKTA_DUMMY_CI_PW == '') {
-      console.warn('Skipping because `OKTA_DUMMY_CI_PW` is not set');
-      return Promise.resolve();
+      return client
+        .getMeta()
+        .then((res) => {
+          expect(res.version).toBeDefined();
+        })
+        .catch((e) => {
+          throw new Error('it should not have errord: ' + e);
+        });
     }
+  );
 
+  check(process.env.OKTA_DUMMY_CI_PW)('makes an Okta logged-in request with username/password', async () => {
     const client = await weaviate.connectToLocal({
       port: 8083,
       authCredentials: new AuthUserPasswordCredentials({
@@ -109,12 +109,7 @@ describe('connection', () => {
       });
   });
 
-  it('makes a WCS logged-in request with username/password', async () => {
-    if (process.env.WCS_DUMMY_CI_PW == undefined || process.env.WCS_DUMMY_CI_PW == '') {
-      console.warn('Skipping because `WCS_DUMMY_CI_PW` is not set');
-      return Promise.resolve();
-    }
-
+  check(process.env.WCS_DUMMY_CI_PW)('makes a WCS logged-in request with username/password', async () => {
     const client = await weaviate.connectToLocal({
       port: 8085,
       authCredentials: new AuthUserPasswordCredentials({
@@ -168,12 +163,7 @@ describe('connection', () => {
       });
   });
 
-  it('makes a logged-in request with access token', async () => {
-    if (process.env.WCS_DUMMY_CI_PW == undefined || process.env.WCS_DUMMY_CI_PW == '') {
-      console.warn('Skipping because `WCS_DUMMY_CI_PW` is not set');
-      return;
-    }
-
+  check(process.env.WCS_DUMMY_CI_PW)('makes a logged-in request with access token', async () => {
     const dummy = new Connection({
       scheme: 'http',
       host: 'localhost:8085',
@@ -208,12 +198,7 @@ describe('connection', () => {
       });
   });
 
-  it('uses refresh token to fetch new access token', async () => {
-    if (process.env.WCS_DUMMY_CI_PW == undefined || process.env.WCS_DUMMY_CI_PW == '') {
-      console.warn('Skipping because `WCS_DUMMY_CI_PW` is not set');
-      return;
-    }
-
+  check(process.env.WCS_DUMMY_CI_PW)('uses refresh token to fetch new access token', async () => {
     const dummy = new Connection({
       scheme: 'http',
       host: 'localhost:8085',
@@ -240,16 +225,14 @@ describe('connection', () => {
     // force the use of refreshToken
     (conn as any).oidcAuth?.resetExpiresAt();
 
-    return conn
-      .login()
-      .then((resp) => {
-        expect(resp).toBeDefined();
-        expect(resp != '').toBeTruthy();
-        conn.oidcAuth?.stopTokenRefresh();
-      })
-      .catch((e: any) => {
-        throw new Error('it should not have errord: ' + e);
-      });
+    return conn.login().then((resp) => {
+      expect(resp).toBeDefined();
+      expect(resp != '').toBeTruthy();
+      conn.oidcAuth?.stopTokenRefresh();
+    });
+    // .catch((e: any) => {
+    //   throw new Error('it should not have errord: ' + e);
+    // });
   });
 
   it('fails to access auth-enabled server without client auth', async () => {