fix: fix broken recording itest

cryostatio · Sep 10, 2024 · ab69956 · ab69956
1 parent e79f101
commit ab69956
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 21 deletions.
diff --git a/src/app/AppLayout/AppLayout.tsx b/src/app/AppLayout/AppLayout.tsx
@@ -398,6 +398,7 @@ export const AppLayout: React.FC<AppLayoutProps> = ({ children }) => {
               <ToolbarGroup variant="icon-button-group">
                 <ToolbarItem>
                   <NotificationBadge
+                    id="notification-badge"
                     count={unreadNotificationsCount}
                     variant={
                       errorNotificationsCount > 0 ? 'attention' : unreadNotificationsCount === 0 ? 'read' : 'unread'

diff --git a/src/app/TargetView/TargetSelect.tsx b/src/app/TargetView/TargetSelect.tsx
@@ -17,7 +17,6 @@ import { LoadingView } from '@app/Shared/Components/LoadingView';
 import { Target } from '@app/Shared/Services/api.types';
 import { getTargetRepresentation, includesTarget, isEqualTarget } from '@app/Shared/Services/api.utils';
 import { ServiceContext } from '@app/Shared/Services/Services';
-import { NoTargetSelected } from '@app/TargetView/NoTargetSelected';
 import { SerializedTarget } from '@app/TargetView/SerializedTarget';
 import { useSubscriptions } from '@app/utils/hooks/useSubscriptions';
 import { getFromLocalStorage } from '@app/utils/LocalStorage';

diff --git a/src/itest/RecordingWorkflow.test.ts b/src/itest/RecordingWorkflow.test.ts
@@ -78,6 +78,8 @@ describe('Recording workflow steps', function () {
     const active = await recordings.getRecordings();
     assert.equal(active.length, 1);
 
+    await cryostat.closeNotificationAlerts();
+
     await recordings.deleteRecording(active[0]);
     await sleep(10000);
     assert.equal((await recordings.getRecordings()).length, 0);

diff --git a/src/itest/util.ts b/src/itest/util.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Builder, By, WebDriver, WebElement, WebElementPromise, until, Actions } from 'selenium-webdriver';
+import { Builder, By, WebDriver, WebElement, WebElementPromise, until } from 'selenium-webdriver';
 import firefox from 'selenium-webdriver/firefox';
 
 const DEFAULT_FIND_ELEMENT_TIMEOUT = 5000;
@@ -95,16 +95,26 @@ export class Cryostat {
     if (skipButton) await skipButton.click();
   }
 
+  async closeNotificationAlerts(): Promise<void> {
+    const notiBadge = await this.driver.wait(until.elementLocated(By.id('notification-badge')));
+
+    // Toggle to open/close
+    await notiBadge.click();
+    return await notiBadge.click();
+  }
+
   async getLatestNotification(): Promise<ITestNotification> {
     const latestNotification = await this.driver.wait(
-      until.elementLocated(By.className('pf-c-alert-group pf-m-toast')),
+      until.elementLocated(By.className('pf-v5-c-alert-group pf-m-toast')),
     );
     return {
       title: await getDirectTextContent(
         this.driver,
-        await latestNotification.findElement(By.css('li:last-of-type .pf-c-alert__title')),
+        await latestNotification.findElement(By.css('li:last-of-type .pf-v5-c-alert__title')),
       ),
-      description: await latestNotification.findElement(By.css('li:last-of-type .pf-c-alert__description')).getText(),
+      description: await latestNotification
+        .findElement(By.css('li:last-of-type .pf-v5-c-alert__description'))
+        .getText(),
     };
   }
 }
@@ -164,10 +174,7 @@ export class Dashboard {
     const addCardButton = await getElementById(this.driver, 'dashboard-add-btn');
     // Can't use click() directly because the button is wrapped by a Tooltip
     const actions = this.driver.actions();
-    actions
-      .move({ origin: addCardButton })
-      .click()
-      .perform();
+    await actions.move({ origin: addCardButton }).click().perform();
     const twoPartCards = [CardType.AUTOMATED_ANALYSIS, CardType.JFR_METRICS_CHART, CardType.MBEAN_METRICS_CHART];
 
     switch (cardType) {
@@ -237,7 +244,7 @@ export class Recordings {
   }
 
   async getRecordings(): Promise<WebElement[]> {
-    const tableXPath = "//div[@class='recording-table--inner-container pf-c-scroll-inner-wrapper']";
+    const tableXPath = "//div[@class='recording-table--inner-container pf-v5-c-scroll-inner-wrapper']";
     return this.driver.findElements(By.xpath(`${tableXPath}//tbody`));
   }
 

diff --git a/src/test/Settings/__snapshots__/AutoRefresh.test.tsx.snap b/src/test/Settings/__snapshots__/AutoRefresh.test.tsx.snap
@@ -33,7 +33,7 @@ Array [
       className="pf-v5-l-split__item"
     >
       <span
-        className="pf-v5-c-form-control pf-m-disabled"
+        className="pf-v5-c-form-control pf-m-disabled duration-picker__form_select"
       >
         <select
           aria-invalid={false}

diff --git a/src/test/Settings/__snapshots__/DeletionDialogControl.test.tsx.snap b/src/test/Settings/__snapshots__/DeletionDialogControl.test.tsx.snap
@@ -71,10 +71,10 @@ exports[`<DeletionDialogControl/> renders correctly 1`] = `
       className="pf-v5-c-expandable-section"
     >
       <button
-        aria-controls="expandable-section-content-17177484467765uqbuek5d18"
+        aria-controls="expandable-section-content-17259356481295ov90zs5f2"
         aria-expanded={false}
         className="pf-v5-c-expandable-section__toggle"
-        id="expandable-section-toggle-1717748446776vbr16rjdf6l"
+        id="expandable-section-toggle-1725935648129cmgthvllnqg"
         onClick={[Function]}
         type="button"
       >
@@ -103,10 +103,10 @@ exports[`<DeletionDialogControl/> renders correctly 1`] = `
         </span>
       </button>
       <div
-        aria-labelledby="expandable-section-toggle-1717748446776vbr16rjdf6l"
+        aria-labelledby="expandable-section-toggle-1725935648129cmgthvllnqg"
         className="pf-v5-c-expandable-section__content"
         hidden={true}
-        id="expandable-section-content-17177484467765uqbuek5d18"
+        id="expandable-section-content-17259356481295ov90zs5f2"
         role="region"
       >
         <div

diff --git a/src/test/Settings/__snapshots__/NotificationControl.test.tsx.snap b/src/test/Settings/__snapshots__/NotificationControl.test.tsx.snap
@@ -198,10 +198,10 @@ exports[`<NotificationControl/> renders correctly 1`] = `
       className="pf-v5-c-expandable-section"
     >
       <button
-        aria-controls="expandable-section-content-1717748448129qag9p523vjj"
+        aria-controls="expandable-section-content-17259356474081mjir64hbea"
         aria-expanded={false}
         className="pf-v5-c-expandable-section__toggle"
-        id="expandable-section-toggle-1717748448130xo7znv5n5mo"
+        id="expandable-section-toggle-17259356474081x6ii635s9t"
         onClick={[Function]}
         type="button"
       >
@@ -230,10 +230,10 @@ exports[`<NotificationControl/> renders correctly 1`] = `
         </span>
       </button>
       <div
-        aria-labelledby="expandable-section-toggle-1717748448130xo7znv5n5mo"
+        aria-labelledby="expandable-section-toggle-17259356474081x6ii635s9t"
         className="pf-v5-c-expandable-section__content"
         hidden={true}
-        id="expandable-section-content-1717748448129qag9p523vjj"
+        id="expandable-section-content-17259356474081mjir64hbea"
         role="region"
       >
         <div

diff --git a/src/test/Settings/__snapshots__/Settings.test.tsx.snap b/src/test/Settings/__snapshots__/Settings.test.tsx.snap
@@ -5,7 +5,7 @@ exports[`<Settings/> renders correctly 1`] = `
   className="pf-v5-c-page__main-group"
 >
   <section
-    className="pf-v5-c-page__main-section"
+    className="pf-v5-c-page__main-section pf-m-fill"
   >
     <nav
       aria-label="Breadcrumb"

diff --git a/src/test/Settings/__snapshots__/WebSocketDebounce.test.tsx.snap b/src/test/Settings/__snapshots__/WebSocketDebounce.test.tsx.snap
@@ -104,7 +104,7 @@ exports[`<WebSocketDebounce/> renders correctly 1`] = `
   <div
     className="pf-v5-c-number-input__unit"
   >
-    ms
+    Milliseconds
   </div>
 </div>
 `;