use 'oc get' to test for 'deletionTimestamp' instead of non-existance…

… of row, which timesout

README.md

@@ -192,6 +192,7 @@ Cypress integration tests are run via [Cypress.io](https://www.cypress.io/).
 Launch Cypress test runner:
 ```
 cd frontend
+oc login ...
 yarn run test-cypress
 ```
 

frontend/packages/integration-tests-cypress/support/index.ts

@@ -2,6 +2,7 @@ import './login';
 import './project';
 import './selectors';
 import './nav';
+import './resources';
 import 'cypress-jest-adapter';
 
 Cypress.Cookies.defaults({

frontend/packages/integration-tests-cypress/support/resources.ts

@@ -0,0 +1,58 @@
+import { plural } from 'pluralize';
+
+import { K8sResourceKindReference } from '@console/internal/module/k8s';
+
+export {};
+declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace,no-redeclare
+  namespace Cypress {
+    interface Chainable<Subject> {
+      resourceShouldBeDeleted(
+        namespace: string,
+        resource: K8sResourceKindReference | string,
+        name: string,
+      ): Chainable<Element>;
+    }
+  }
+}
+
+// Convert types in the `user.openshift.io~v1~Group` format to `groups.v1.useropenshift.io`
+// to pass to oc.
+const toCLIType = (type: K8sResourceKindReference | string): string => {
+  if (!type.includes('~')) {
+    return type;
+  }
+  const [group, version, kind] = type.split('~');
+  // Resources aren't required to follow this pattern when converting from kind to plural,
+  // but this should work for most resources and is good enough for our tests.
+  return `${plural(kind.toLowerCase())}.${version}.${group}`;
+};
+
+// any command added below, must be added to global Cypress interface above
+
+Cypress.Commands.add(
+  'resourceShouldBeDeleted',
+  (namespace: string, resource: K8sResourceKindReference | string, name: string) =>
+    cy
+      .exec(
+        `oc get -n ${namespace} ${toCLIType(
+          resource,
+        )}/${name} -o template --template '{{.metadata.deletionTimestamp}}'`,
+        { failOnNonZeroExit: false },
+      )
+      .then((result) => {
+        if (result.code !== 0) {
+          if (result.stderr.includes('NotFound')) {
+            cy.log(
+              `'oc get -n ${namespace} ${resource}/${name}' returned 'NotFound' indicating resource was successfully deleted`,
+            );
+          } else {
+            // this typically would be a 'You must be logged in to the server (Unauthorized)'
+            assert.fail('', '', `Error during 'oc get ${resource}/${name}', ${result.stderr} `);
+          }
+        } else {
+          cy.log(`expect ${resource}/${name} to have a deletionTimestamp`);
+          expect(result.stdout).not.toContain(`<no value>`);
+        }
+      }),
+);

frontend/packages/integration-tests-cypress/tests/crud/k8-openshift-cruds.spec.ts

@@ -107,7 +107,7 @@ describe('Kubernetes resource CRUD operations', () => {
         modal.shouldBeOpened();
         modal.submit();
         modal.shouldBeClosed();
-        listPage.rows.shouldNotExist(name);
+        cy.resourceShouldBeDeleted(testName, resource, name);
       };
 
       before(() => {