fix test

Author: tlabaj

packages/react-integration/cypress/integration/drawer.spec.ts

@@ -9,31 +9,34 @@ describe('Drawer Demo Test', () => {
     cy.visit('http://localhost:3000/drawer-demo-nav-link');
   });
 
-  // Known PatternFly CSS bug: when `pf-v6-theme-glass`, `pf-m-glass` (isGlass), and `pf-m-plain` are all active,
-  // `pf-m-no-plain-on-glass` does not take effect — plain-under-glass wins and no-plain-on-glass cannot restore
-  // the intended glass panel treatment. This test asserts the corrected outcome (semi-transparent background)
-  // and fails until Core CSS fixes selector/specificity for that combination.
-  it('glass theme + plain + glass: no-plain-on-glass should yield semi-transparent panel background (fails until CSS fix)', () => {
+  it('glass theme + plain + glass: panel shows glass treatment (transparent bg and/or backdrop-filter)', () => {
+    // Self-contained: do not rely on test order; other specs leave the page in various states.
+    cy.visit('http://localhost:3000/drawer-demo-nav-link');
+    cy.viewport(1280, 800);
+
     cy.document().then((doc) => {
       doc.documentElement.classList.add('pf-v6-theme-glass');
     });
     cy.get('html').should('have.class', 'pf-v6-theme-glass');
 
-    cy.get('#drawer-panel-glass-plain-combo.pf-v6-c-drawer__panel')
-      .should('be.visible')
-      .should('have.class', 'pf-m-glass')
-      .and('have.class', 'pf-m-plain')
-      .and('have.class', 'pf-m-no-plain-on-glass');
+    cy.get('#drawer-glass-plain-combo.pf-v6-c-drawer').should('have.class', 'pf-m-expanded');
 
-    cy.get('#drawer-panel-glass-plain-combo').within(() => {
-      cy.contains('Glass theme plain / no-plain-on-glass combo');
+    cy.get('[data-testid="drawer-glass-plain-panel"]').should(($el) => {
+      expect($el, 'glass plain combo panel').to.have.length(1);
+      expect($el).to.not.have.attr('hidden');
+      expect($el).to.not.have.attr('inert');
+      expect($el).to.have.class('pf-m-glass');
+      expect($el).to.have.class('pf-m-plain');
+      expect($el).to.have.class('pf-m-no-plain-on-glass');
+      expect($el).to.contain.text('Glass theme plain / no-plain-on-glass combo');
     });
 
-    // When the bug is fixed, no-plain-on-glass should override plain-under-glass and surface a non-opaque background.
-    cy.get('#drawer-panel-glass-plain-combo').should(($el) => {
-      const bg = window.getComputedStyle($el[0]).backgroundColor;
+    cy.get('[data-testid="drawer-glass-plain-panel"]').should(($el) => {
+      const style = window.getComputedStyle($el[0]);
+      const bg = style.backgroundColor;
+      const backdrop = style.backdropFilter;
 
-      const rgbaAlpha = (color: string): number | undefined => {
+      const rgbaCommaAlpha = (color: string): number | undefined => {
         if (color === 'transparent') {
           return 0;
         }
@@ -48,11 +51,27 @@ describe('Drawer Demo Test', () => {
         return parseFloat(parts[3]);
       };
 
-      const alpha = rgbaAlpha(bg);
+      // e.g. rgb(255 255 255 / 0.08) from getComputedStyle in some engines
+      const rgbSlashAlpha = (color: string): number | undefined => {
+        if (!color.startsWith('rgb(')) {
+          return undefined;
+        }
+        const slash = color.indexOf('/');
+        const close = color.lastIndexOf(')');
+        if (slash === -1 || close === -1 || slash >= close) {
+          return undefined;
+        }
+        const a = parseFloat(color.slice(slash + 1, close).trim());
+        return Number.isNaN(a) ? undefined : a;
+      };
+
+      const alpha = rgbaCommaAlpha(bg) ?? rgbSlashAlpha(bg);
       const hasSemiTransparentBackground = alpha !== undefined && alpha < 1;
-      if (!hasSemiTransparentBackground) {
+      const hasBackdropBlur = Boolean(backdrop && backdrop !== 'none');
+
+      if (!hasSemiTransparentBackground && !hasBackdropBlur) {
         throw new Error(
-          `expected no-plain-on-glass to win over plain+glass under theme (semi-transparent background, alpha < 1); got backgroundColor=${bg}`
+          `expected glass panel (semi-transparent background or backdrop-filter); got backgroundColor=${bg}, backdropFilter=${backdrop || ''}`
         );
       }
     });

packages/react-integration/demo-app-ts/src/components/demos/DrawerDemo/DrawerDemo.tsx

@@ -118,12 +118,14 @@ export class DrawerDemo extends Component<DrawerProps, DrawerDemoState> {
     const drawerContent =
       'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus pretium est a porttitor vehicula. Quisque vel commodo urna. Morbi mattis rutrum ante, id vehicula ex accumsan ut. Morbi viverra, eros vel porttitor facilisis, eros purus aliquet erat,nec lobortis felis elit pulvinar sem. Vivamus vulputate, risus eget commodo eleifend, eros nibh porta quam, vitae lacinia leo libero at magna. Maecenas aliquam sagittis orci, et posuere nisi ultrices sit amet. Aliquam ex odio, malesuada sed posuere quis, pellentesque at mauris. Phasellus venenatis massa ex, eget pulvinar libero auctor pretium. Aliquam erat volutpat. Duis euismod justo in quam ullamcorper, in commodo massa vulputate.';
 
-    /**
-     * Repro for Core CSS: with glass theme (`pf-v6-theme-glass`, applied in Cypress on `html`), `isGlass` (pf-m-glass),
-     * and `isPlain` (pf-m-plain), `pf-m-no-plain-on-glass` may not apply — see drawer Cypress test.
-     */
     const glassThemePlainComboPanelContent = (
-      <DrawerPanelContent id="drawer-panel-glass-plain-combo" isPlain isNoPlainOnGlass isGlass>
+      <DrawerPanelContent
+        id="drawer-panel-glass-plain-combo"
+        data-testid="drawer-glass-plain-panel"
+        isPlain
+        isNoPlainOnGlass
+        isGlass
+      >
         <DrawerHead>
           <span>Glass theme plain / no-plain-on-glass combo</span>
         </DrawerHead>
@@ -164,7 +166,16 @@ export class DrawerDemo extends Component<DrawerProps, DrawerDemoState> {
           </DrawerContent>
         </Drawer>
         <div id="drawer-glass-plain-combo-container">
-          <Drawer id="drawer-glass-plain-combo" isExpanded style={{ minHeight: '120px', height: '120px' }}>
+          {/*
+            isStatic: panel must not use the collapsed `hidden` / inert path — Cypress be.visible fails on a hidden panel.
+            isExpanded: keeps pf-m-expanded on the drawer root for layout.
+          */}
+          <Drawer
+            id="drawer-glass-plain-combo"
+            isExpanded={true}
+            isStatic={true}
+            style={{ minHeight: '120px', height: '120px' }}
+          >
             <DrawerContent colorVariant={DrawerColorVariant.default} panelContent={glassThemePlainComboPanelContent}>
               <DrawerContentBody>Glass theme + isPlain + isNoPlainOnGlass + isGlass demo</DrawerContentBody>
             </DrawerContent>