Proper clean-up to temporary organisation

openmrs · Aug 10, 2021 · 0085357 · 0085357
1 parent 9bfe90d
commit 0085357
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
@@ -475,16 +475,21 @@ Cypress.Commands.add(
         headers: {
           Authorization: authToken
         },
-        url: `${apiUrl}/orgs/${organisation}/`
+        url: `${apiUrl}/orgs/${organisation}/`,
+        failOnStatusCode: !isCleanup
       }).then(response => {
-        if (getUser() === response.body.created_by) {
+        if (
+          response.status >= 200 &&
+          response.status < 400 &&
+          getUser() === response.body.created_by
+        ) {
           cy.request({
             method: "DELETE",
             headers: {
               Authorization: authToken
             },
             url: `${apiUrl}/orgs/${organisation}/`,
-            failOnStatusCode: !!!isCleanup
+            failOnStatusCode: !isCleanup
           });
         }
       });