webkit test fix

penpot · Aug 23, 2024 · 1b37415 · 1b37415
1 parent 147b189
commit 1b37415
Show file tree

Hide file tree

Showing 8 changed files with 120 additions and 33 deletions.
diff --git a/pages/dashboard/dashboard-page.js b/pages/dashboard/dashboard-page.js
@@ -884,4 +884,8 @@ exports.DashboardPage = class DashboardPage extends BasePage {
   async checkPageNumber(number) {
     await expect(this.onboardingPaginator).toHaveText(`${number}/5`);
   }
+
+  async waitForCreateFilePlaceholderVisible() {
+    await this.createFileButtonPlaceholder.first().waitFor({ state: 'visible' });
+  }
 };
diff --git a/pages/dashboard/team-page.js b/pages/dashboard/team-page.js
@@ -10,6 +10,7 @@ exports.TeamPage = class TeamPage extends BasePage {
 
     // Teams
     this.teamCurrentBtn = page.locator('button[class*="current-team"]');
+    this.teamCurrentBtnWebkit = page.locator('button[class*="current-team"] div span').first();
     this.teamList = page.locator('ul[class*="teams-dropdown"]');
     this.createNewTeamMenuItem = page.locator('#teams-selector-create-team');
     this.teamNameInput = page.locator('#name');
@@ -111,8 +112,14 @@ exports.TeamPage = class TeamPage extends BasePage {
     await this.createNewTeamButton.click();
   }
 
-  async isTeamSelected(teamName) {
-    await expect(this.teamCurrentBtn).toHaveText(teamName);
+  async isTeamSelected(teamName, browserName = 'chrome') {
+    browserName === 'webkit'
+      ? await expect(this.teamCurrentBtnWebkit).toHaveText(teamName)
+      : await expect(this.teamCurrentBtn).toHaveText(teamName);
+  }
+
+  async waitForTeamBtn(timeout = 10000) {
+    await this.teamCurrentBtnWebkit.waitFor({ state: 'visible' , timeout: timeout});
   }
 
   async openTeamsListIfClosed() {

diff --git a/pages/workspace/main-page.js b/pages/workspace/main-page.js
@@ -338,6 +338,16 @@ exports.MainPage = class MainPage extends BasePage {
     await expect(this.viewport).toBeVisible();
   }
 
+  async isMainPageVisible() {
+    try {
+      await this.viewport.waitFor({ state: 'visible' , timeout: 8000});
+      return true;
+    } catch (error) {
+      console.log(error);
+      return false;
+    }
+  }
+
   async isProjectAndFileNameExistInFile(projectName, fileName) {
     await expect(this.projectNameSpan).toContainText(projectName);
     await expect(this.fileNameSpan.last()).toHaveText(fileName);

diff --git a/pages/workspace/view-mode-page.js b/pages/workspace/view-mode-page.js
@@ -281,6 +281,10 @@ exports.ViewModePage = class ViewModePage extends BasePage {
       : await expect(this.viewerLoyautSection).not.toBeVisible();
   }
 
+  async waitForViewerSection(timeout = 10000) {
+    await this.viewerLoyautSection.waitFor({ state: 'visible' , timeout: timeout});
+  }
+
   async clickDestroyLincButton() {
     await this.destroyLincButton.click();
     await this.destroyLincButton.click();

diff --git a/tests/assets/assets-colors.spec.js b/tests/assets/assets-colors.spec.js
@@ -12,13 +12,16 @@ const { qase } = require('playwright-qase-reporter/dist/playwright');
 
 const teamName = random().concat('autotest');
 
-test.beforeEach(async ({ page }) => {
+test.beforeEach(async ({ page, browserName }) => {
   const teamPage = new TeamPage(page);
   const dashboardPage = new DashboardPage(page);
   const mainPage = new MainPage(page);
   await teamPage.createTeam(teamName);
   await teamPage.isTeamSelected(teamName);
   await dashboardPage.createFileViaPlaceholder();
+  browserName === 'webkit' && !( await mainPage.isMainPageVisible())
+    ? await dashboardPage.createFileViaPlaceholder()
+    : null;
   await mainPage.isMainPageLoaded();
 });
 
@@ -48,7 +51,7 @@ mainTest.describe(() => {
     await colorPalettePopUp.clickSaveColorStyleButton();
     await mainPage.clickViewportTwice();
     await mainPage.waitForChangeIsSaved();
-  }); 
+  });
 
   mainTest(qase(933,'AS-23 File library colors - add'), async ({ page }) => {
     const assetsPanelPage = new AssetsPanelPage(page);

diff --git a/tests/assets/assets-shortcuts-panel.spec.js b/tests/assets/assets-shortcuts-panel.spec.js
@@ -9,13 +9,16 @@ const { qase } = require('playwright-qase-reporter/dist/playwright');
 
 const teamName = random().concat('autotest');
 
-test.beforeEach(async ({ page }) => {
+test.beforeEach(async ({ page, browserName }) => {
   const teamPage = new TeamPage(page);
   const dashboardPage = new DashboardPage(page);
   const mainPage = new MainPage(page);
   await teamPage.createTeam(teamName);
   await teamPage.isTeamSelected(teamName);
   await dashboardPage.createFileViaPlaceholder();
+  browserName === 'webkit' && !( await mainPage.isMainPageVisible())
+    ? await dashboardPage.createFileViaPlaceholder()
+    : null;
   await mainPage.isMainPageLoaded();
 });
 

diff --git a/tests/components/main-components/create-main-components.spec.js b/tests/components/main-components/create-main-components.spec.js
@@ -13,12 +13,15 @@ const { qase } = require('playwright-qase-reporter/dist/playwright');
 
 const teamName = random().concat('autotest');
 
-test.beforeEach(async ({ page }) => {
+test.beforeEach(async ({ page, browserName }) => {
   const dashboardPage = new DashboardPage(page);
   const teamPage = new TeamPage(page);
   const mainPage = new MainPage(page);
   await teamPage.createTeam(teamName);
   await dashboardPage.createFileViaPlaceholder();
+  browserName === 'webkit' && !( await mainPage.isMainPageVisible())
+    ? await dashboardPage.createFileViaPlaceholder()
+    : null;
   await mainPage.isMainPageLoaded();
 });