Merge pull request #8 from antonbsa/18289-layout-enhancements

layout enhancements - test fixes

bigbluebutton-html5/imports/ui/components/layout/modal/component.jsx

@@ -98,6 +98,7 @@ const LayoutModalComponent = (props) => {
           label={intl.formatMessage(intlMessages.updateAll)}
           onClick={() => handleUpdateLayout(true)}
           color="secondary"
+          data-test="updateEveryoneLayoutBtn"
         />
       );
     }
@@ -153,6 +154,7 @@ const LayoutModalComponent = (props) => {
           color="primary"
           label={intl.formatMessage(intlMessages.update)}
           onClick={() => handleUpdateLayout(false)}
+          data-test="updateLayoutBtn"
         />
       </Styled.ButtonBottomContainer>
       <div style={{ display: 'none' }} id="layout-btn-desc">{intl.formatMessage(intlMessages.layoutBtnDesc)}</div>

bigbluebutton-tests/playwright/core/elements.js

@@ -155,7 +155,6 @@ exports.selectCameraQualityId = 'select[id="setQuality"]';
 exports.virtualBackgrounds = 'div[data-test="virtualBackground"]';
 exports.speechRecognition = 'div[data-test="speechRecognition"]';
 exports.learningDashboard = 'li[data-test="learningDashboard"]';
-exports.propagateLayout = 'li[data-test="propagateLayout"]';
 exports.layoutModal = 'li[data-test="layoutModal"]';
 
 // Notes
@@ -489,8 +488,8 @@ exports.focusOnPresentation = 'button[data-test="presentationFocusLayout"]';
 exports.focusOnVideo = 'button[data-test="videoFocusLayout"]';
 exports.smartLayout = 'button[data-test="smartLayout"]';
 exports.customLayout = 'button[data-test="customLayout"]';
-exports.pushLayoutToggle = 'input#TogglePush';
-exports.confirmButton = 'button[aria-label="Confirm"]';
+exports.updateLayoutBtn = 'button[data-test="updateLayoutBtn"]';
+exports.updateEveryoneLayoutBtn = 'button[data-test="updateEveryoneLayoutBtn"]';
 exports.cameraDock = 'div#cameraDock';
 
 // Font size

bigbluebutton-tests/playwright/customparameters/customparameters.js

@@ -257,7 +257,6 @@ class CustomParameters extends MultiUsers {
 
   async layouts() {
     await this.modPage.waitAndClick(e.actions);
-    await this.modPage.wasRemoved(e.propagateLayout);
     await this.modPage.wasRemoved(e.layoutModal);
   }
 
@@ -344,7 +343,6 @@ class CustomParameters extends MultiUsers {
 
   async layoutsExclude() {
     await this.modPage.waitAndClick(e.actions);
-    await this.modPage.hasElement(e.propagateLayout);
     await this.modPage.hasElement(e.layoutModal);
   }
 

bigbluebutton-tests/playwright/layouts/layouts.js

@@ -7,7 +7,7 @@ class Layouts extends MultiUsers {
     await this.modPage.waitAndClick(e.actions);
     await this.modPage.waitAndClick(e.layoutSettingsModalButton);
     await this.modPage.waitAndClick(e.focusOnPresentation);
-    await this.modPage.waitAndClick(e.confirmButton);
+    await this.modPage.waitAndClick(e.updateLayoutBtn);
     await this.modPage.waitAndClick(e.toastContainer);
     await this.modPage.wasRemoved(e.toastContainer);
 
@@ -18,7 +18,7 @@ class Layouts extends MultiUsers {
     await this.modPage.waitAndClick(e.actions);
     await this.modPage.waitAndClick(e.layoutSettingsModalButton);
     await this.modPage.waitAndClick(e.focusOnVideo);
-    await this.modPage.waitAndClick(e.confirmButton);
+    await this.modPage.waitAndClick(e.updateLayoutBtn);
     await this.modPage.waitAndClick(e.toastContainer);
     await this.modPage.wasRemoved(e.toastContainer);
 
@@ -29,7 +29,7 @@ class Layouts extends MultiUsers {
     await this.modPage.waitAndClick(e.actions);
     await this.modPage.waitAndClick(e.layoutSettingsModalButton);
     await this.modPage.waitAndClick(e.smartLayout);
-    await this.modPage.waitAndClick(e.confirmButton);
+    await this.modPage.waitAndClick(e.updateLayoutBtn);
     await this.modPage.waitAndClick(e.toastContainer);
     await this.modPage.wasRemoved(e.toastContainer);
 
@@ -46,7 +46,7 @@ class Layouts extends MultiUsers {
     await this.modPage.waitAndClick(e.actions);
     await this.modPage.waitAndClick(e.layoutSettingsModalButton);
     await this.modPage.waitAndClick(e.customLayout);
-    await this.modPage.waitAndClick(e.confirmButton);
+    await this.modPage.waitAndClick(e.updateLayoutBtn);
     await this.modPage.waitAndClick(e.toastContainer);
     await this.modPage.wasRemoved(e.toastContainer);
 
@@ -79,12 +79,11 @@ class Layouts extends MultiUsers {
     await reopenChatSidebar(this.modPage);
   }
 
-  async pushLayout() {
+  async updateEveryone() {
     await this.modPage.waitAndClick(e.actions);
     await this.modPage.waitAndClick(e.layoutSettingsModalButton);
     await this.modPage.waitAndClick(e.customLayout);
-    await this.modPage.waitAndClickElement(e.pushLayoutToggle);
-    await this.modPage.waitAndClick(e.confirmButton);
+    await this.modPage.waitAndClick(e.updateEveryoneLayoutBtn);
     await this.modPage.waitAndClick(e.toastContainer);
     await this.modPage.wasRemoved(e.toastContainer);
 
@@ -105,7 +104,7 @@ class Layouts extends MultiUsers {
     await this.modPage.waitAndClick(e.restorePresentation);
     await this.modPage.dragAndDropWebcams(e.dropAreaSidebarBottom);
 
-    await checkScreenshots(this, 'video', 'push-layout');
+    await checkScreenshots(this, 'video', 'update-everyone');
   }
 }
 

bigbluebutton-tests/playwright/layouts/layouts.spec.js

@@ -7,7 +7,7 @@ const hidePresentationToast = encodeCustomParams(PARAMETER_HIDE_PRESENTATION_TOA
 
 const CUSTOM_MEETING_ID = 'layout_management_meeting';
 
-test.describe.serial('Layout management', () => {
+test.describe.serial("Layout management", () => {
   const layouts = new Layouts();
 
   test.beforeAll(async ({ browser }) => {
@@ -19,23 +19,23 @@ test.describe.serial('Layout management', () => {
     await layouts.userPage.shareWebcam();
   });
 
-  test('Focus on presentation', async () => {
+  test("Focus on presentation", async () => {
     await layouts.focusOnPresentation();
   });
 
-  test('Focus on video', async () => {
+  test("Focus on video", async () => {
     await layouts.focusOnVideo();
   });
 
-  test('Smart layout', async () => {
+  test("Smart layout", async () => {
     await layouts.smartLayout();
   });
 
-  test('Custom layout', async () => {
+  test("Custom layout", async () => {
     await layouts.customLayout();
   });
 
-  test('Push layout to all', async () => {
-    await layouts.pushLayout();
+  test("Update everyone's layout", async () => {
+    await layouts.updateEveryone();
   });
 });