Merge branch 'OCD-4504' into development

chpladmin · Mar 5, 2024 · 45c2639 · 45c2639
2 parents 9b15e0d + 156c2db
commit 45c2639
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 22 deletions.
diff --git a/e2e/pages/administration/change-requests/change-requests.po.js b/e2e/pages/administration/change-requests/change-requests.po.js
@@ -12,7 +12,7 @@ class ChangeRequestsPage extends CollectionPage {
 
   async open() {
     await openPage('#/administration/change-requests');
-    await (browser.waitUntil(async () => (await $(this.elements.searchResultsHeader)).isDisplayed()));
+    await (browser.waitUntil(async () => (await $(this.elements.filterPanelToggle)).isDisplayed()));
   }
 }
 

diff --git a/e2e/pages/administration/change-requests/change-requests.readonly.spec.js b/e2e/pages/administration/change-requests/change-requests.readonly.spec.js
@@ -1,35 +1,20 @@
 import LoginComponent from '../../../components/login/login.po';
-import { open } from '../../../utilities/hooks.async';
 
 import ChangeRequestsPage from './change-requests.po';
 
 let login;
 let page;
 
-beforeEach(async () => {
+beforeAll(async () => {
   page = new ChangeRequestsPage();
   login = new LoginComponent();
-  await open('#/resources/overview');
+  await page.open();
 });
 
 describe('the Change Requests page', () => {
   describe('when logged in as ONC', () => {
-    beforeEach(async () => {
+    beforeAll(async () => {
       await login.logIn('onc');
-      await page.open();
-    });
-
-    afterEach(async () => {
-      await login.logOut();
-    });
-
-    it('should have table headers in a defined order', async () => {
-      const expectedHeaders = ['Developer', 'Request Type', 'Creation Date', 'Request Status', 'Time Since Last Status Change', 'Associated ONC-ACBs', 'Actions'];
-      const actualHeaders = await page.getTableHeaders();
-      await expect(actualHeaders.length).toBe(expectedHeaders.length, 'Found incorrect number of columns');
-      for (const [idx, header] of actualHeaders.entries()) {
-        await expect(await header.getText()).toBe(expectedHeaders[idx]);
-      }
     });
 
     it('should find a specific Rejected Change Request', async () => {
@@ -38,11 +23,21 @@ describe('the Change Requests page', () => {
       const creationColumn = 2;
       const developerName = 'Universal EHR, Inc.';
       const creationTime = 'Apr 20, 2022 1:28:20 PM';
+      await page.clearFilter('Change Request Status', 'Pending Developer Action');
+      await page.clearFilter('Change Request Status', 'Pending ONC-ACB Action');
       await page.setListFilter('currentStatusNames', 'Rejected');
-      await page.removeFilter('Change Request Status', 'Pending Developer Action');
       await page.searchForText(searchTerm);
-      await expect(await page.getCellInRow(0, developerColumn)).toContain(developerName);
-      await expect(await page.getCellInRow(0, creationColumn)).toContain(creationTime);
+      expect(await page.getCellInRow(0, developerColumn)).toContain(developerName);
+      expect(await page.getCellInRow(0, creationColumn)).toContain(creationTime);
+    });
+
+    it('should have table headers in a defined order', async () => {
+      const expectedHeaders = ['Developer', 'Request Type', 'Creation Date', 'Request Status', 'Time Since Last Status Change', 'Associated ONC-ACBs', 'Actions'];
+      const actualHeaders = await page.getTableHeaders();
+      expect(actualHeaders.length).toBe(expectedHeaders.length, 'Found incorrect number of columns');
+      for (const [idx, header] of actualHeaders.entries()) {
+        expect(await header.getText()).toBe(expectedHeaders[idx]);
+      }
     });
   });
 });
diff --git a/e2e/pages/collections/collection.po.js b/e2e/pages/collections/collection.po.js
@@ -223,6 +223,27 @@ class CollectionPage {
     }
   }
   /* eslint-enable indent */
+
+  /* eslint-disable indent */
+  async clearFilter(category, value) {   
+    await
+    (await
+     (await
+      (await
+       (await
+        (await
+         (await
+          (await
+           $(this.elements.filterChipsSection)
+          ).$(`p=${category}`)
+         ).parentElement()
+        ).$(`span=${value}`)
+       ).parentElement()
+      ).$('svg')
+     ).click()
+    );
+  }
+  /* eslint-enable indent */
 }
 
 export default CollectionPage;