From 40932afa26c2aaa35e725a1fc62fd31aea534c67 Mon Sep 17 00:00:00 2001
From: impelcrypto <92044428+impelcrypto@users.noreply.github.com>
Date: Mon, 14 Aug 2023 17:58:05 -0700
Subject: [PATCH] test: updated clickDisclaimerButton function for the new
 disclaimer modal (#897)

* test: updated clickDisclaimerButton function

* fix dappstaking register (#898)

* Fix/test disclaimer (#899)

* fix dappstaking register

* more disclaimers

---------

Co-authored-by: Gregory Luneau <greg@astar.network>
---
 src/modules/playwright/index.ts                   | 3 +--
 tests/test_specs/dappstaking-register.spec.ts     | 5 +++--
 tests/test_specs/dappstaking-transactions.spec.ts | 5 +++--
 tests/test_specs/dappstaking.spec.ts              | 6 +++++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/modules/playwright/index.ts b/src/modules/playwright/index.ts
index 5cb38064f..53d716c52 100644
--- a/src/modules/playwright/index.ts
+++ b/src/modules/playwright/index.ts
@@ -15,6 +15,5 @@ export const checkInjectedWeb3 = async (page: Page): Promise<JSHandle<boolean>>
 };
 
 export const clickDisclaimerButton = async (page: Page): Promise<void> => {
-  const acceptPolicy = page.locator('.wrapper--modal-disclaimer > button:has-text("Agree")');
-  await acceptPolicy.click();
+  await page.getByRole('button', { name: 'Agree' }).click();
 };
diff --git a/tests/test_specs/dappstaking-register.spec.ts b/tests/test_specs/dappstaking-register.spec.ts
index 55a10c81c..7b832cdda 100644
--- a/tests/test_specs/dappstaking-register.spec.ts
+++ b/tests/test_specs/dappstaking-register.spec.ts
@@ -1,3 +1,4 @@
+import { clickDisclaimerButton } from 'src/modules/playwright';
 import { BrowserContext, Page, expect } from '@playwright/test';
 import { test } from '../fixtures';
 import {
@@ -23,8 +24,8 @@ test.afterAll(async () => {
 test.beforeEach(async ({ page, context }: { page: Page; context: BrowserContext }) => {
   await page.goto('/astar/dapp-staking/discover');
 
-  // Close cookies popup
-  await page.getByRole('button', { name: 'Accept' }).click();
+  // Close disclaimer popup
+  await clickDisclaimerButton(page);
 
   const polkadotButton = page.getByText('Polkadot.js');
   await polkadotButton.click();
diff --git a/tests/test_specs/dappstaking-transactions.spec.ts b/tests/test_specs/dappstaking-transactions.spec.ts
index ea5a5975a..1cb6984cf 100644
--- a/tests/test_specs/dappstaking-transactions.spec.ts
+++ b/tests/test_specs/dappstaking-transactions.spec.ts
@@ -1,3 +1,4 @@
+import { clickDisclaimerButton } from 'src/modules/playwright';
 import { BrowserContext, Page, expect } from '@playwright/test';
 import {
   ALICE_ACCOUNT_NAME,
@@ -42,8 +43,8 @@ const stake = async (page: Page, context: BrowserContext, amount: bigint): Promi
 test.beforeEach(async ({ page, context }) => {
   await page.goto('/astar/dapp-staking/discover');
 
-  // Close cookies popup
-  await page.getByRole('button', { name: 'Accept' }).click();
+  // Close disclaimer popup
+  await clickDisclaimerButton(page);
 
   const closeButton = page.getByText('Polkadot.js');
   await closeButton.click();
diff --git a/tests/test_specs/dappstaking.spec.ts b/tests/test_specs/dappstaking.spec.ts
index f86817b52..47f16e48f 100644
--- a/tests/test_specs/dappstaking.spec.ts
+++ b/tests/test_specs/dappstaking.spec.ts
@@ -1,5 +1,5 @@
 import { test, expect } from '@playwright/test';
-import { checkPolicyInLocalStorage, checkInjectedWeb3 } from 'src/modules/playwright';
+import { clickDisclaimerButton, checkInjectedWeb3 } from 'src/modules/playwright';
 
 test.beforeEach(async ({ page }) => {
   await page.goto('/astar/dapp-staking/discover');
@@ -39,6 +39,7 @@ test.describe('on dapp staking screen', () => {
   });
 
   test('should clickable the banner after loading is complete', async ({ page }) => {
+    await clickDisclaimerButton(page);
     const closeButton = page.locator('.modal-close');
     await closeButton.click();
     const bannerCard = page.locator('.wrapper--banners .card:first-child');
@@ -48,6 +49,7 @@ test.describe('on dapp staking screen', () => {
   });
 
   test('should redirect to dapp page when click the dapp card', async ({ page }) => {
+    await clickDisclaimerButton(page);
     const closeButton = page.locator('.modal-close');
     await closeButton.click();
     await page.waitForSelector('.loader', { state: 'hidden' });
@@ -58,6 +60,7 @@ test.describe('on dapp staking screen', () => {
   });
 
   test('should display staking button when over the dapp card', async ({ page }) => {
+    await clickDisclaimerButton(page);
     const closeButton = page.locator('.modal-close');
     await closeButton.click();
     await page.waitForSelector('.loader', { state: 'hidden' });
@@ -69,6 +72,7 @@ test.describe('on dapp staking screen', () => {
   });
 
   test('should clickable item on the on chain data after loading is complete', async ({ page }) => {
+    await clickDisclaimerButton(page);
     const closeButton = page.locator('.modal-close');
     await closeButton.click();
     await page.waitForSelector('.loader', { state: 'hidden' });