Merge branch 'dev' into km_WOR-132_addtional_testing

DataBiosphere · Nov 27, 2024 · 6b43400 · 6b43400
2 parents eebf7c6 + d95b49d
commit 6b43400
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/integration-tests/tests/preview-drs-uri.js b/integration-tests/tests/preview-drs-uri.js
@@ -54,8 +54,6 @@ const testPreviewDrsUriFn = _.flow(
   await click(page, clickable({ textContains: testEntity.entityType }));
   console.log('opening preview for entity...');
   await click(page, elementInDataTableRow(testEntity.name, testEntity.attributes.file_uri));
-  console.log('waiting for no spinners in preview modal...');
-  await waitForNoSpinners(page);
   console.log('verifying text in preview modal...');
   await findText(page, 'Filename');
   await findText(page, 'File size');

diff --git a/integration-tests/utils/integration-helpers.js b/integration-tests/utils/integration-helpers.js
@@ -210,7 +210,12 @@ const withWorkspace = (test) => async (options) => {
     await test({ ...options, workspaceName });
   } finally {
     console.log('withWorkspace cleanup ...');
-    const didDelete = await withSignedInPage(deleteWorkspaceInUi)({ ...options, workspaceName });
+    let didDelete = false;
+    try {
+      didDelete = await withSignedInPage(deleteWorkspaceInUi)({ ...options, workspaceName });
+    } catch (err) {
+      console.error(`Error during workspace cleanup: ${err}`);
+    }
     if (!didDelete) {
       // Pass test on a failed cleanup - expect leaked resources to be cleaned up by the test `delete-orphaned-workspaces`
       console.error(`Unable to delete workspace ${workspaceName} via the UI. The resource will be leaked!`);