MultiPage_DockerRevert

Author: akshayp7

Diff for: Dockerfile

@@ -1,12 +1,6 @@
-FROM mcr.microsoft.com/playwright:next
+FROM mcr.microsoft.com/playwright:v1.22.0-focal
 
-#Create a new Folder to provide permissions for non root user
-RUN mkdir -p /newfolder
-
-WORKDIR /newfolder
-
-#Switched to root user to install dependencies
-USER root 
+WORKDIR /app
 
 COPY package.json package-lock.json ./
 
@@ -16,13 +10,4 @@ COPY . .
 
 RUN npx playwright install chrome
 
-#Creating a User(Turing) with non Root Permissions 
-RUN useradd -u 8877 Turing
-
-#Permission inside newfolder so that reports can be generated
-RUN chown Turing /newfolder
-
-#Switch from root user to non root user
-USER Turing
-
 CMD ["npx","cross-env","ENV=qa","npm","run","test:serial"]

Diff for: lib/WebActions.ts

@@ -127,14 +127,15 @@ export class WebActions {
     }
 
 
-    async verifyNewWindowUrl(context: BrowserContext, locator: string, urlText: string): Promise<void> {
-        const [newWindow] = await Promise.all([
-            context.waitForEvent("page"),
-            await this.page.click(locator)
+    async verifyNewWindowUrlAndClick(context: BrowserContext, newWindowLocator: string, urlText: string,clickOnNewWindowLocator:string): Promise<void> {
+        const [newPage] = await Promise.all([
+            context.waitForEvent('page'),
+            this.page.click(newWindowLocator)
         ])
-        await newWindow.waitForLoadState("load");
-        expect(newWindow.url()).toContain(urlText);
-        await newWindow.close();
+        await newPage.waitForLoadState();
+        expect(newPage.url()).toContain(urlText);
+        await newPage.click(clickOnNewWindowLocator);
+        await newPage.close();
     }
 
     async verifyElementContainsText(locator: string, text: string): Promise<void> {

Diff for: pageFactory/objectRepository/MyAccountPageObjects.ts

@@ -2,4 +2,5 @@ export class MyAccountPageObjects {
     MY_ACCOUNT_HDR_XPATH = `//h1[contains(text(),'My account')]`;
     MY_ACCOUNT_LINKS_XPATH = `//span[contains(text(),'linkName')]`;
     MY_ACCOUNT_FOLLOW_FB_LINK_XPATH="//span[text()='Facebook']/..";
+    MY_ACCOUNT_FB_MEMBERS_LINK_XPATH=`//a[contains(text(),'members')]`;
 }

Diff for: pageFactory/pageRepository/MyAccountPage.ts

@@ -22,9 +22,8 @@ export class MyAccountPage {
         await webActions.clickElement(this.myAccountPageObjects.MY_ACCOUNT_LINKS_XPATH.replace(`linkName`, linkName));
     }
 
-    async verifyFollowUsFBWindow(context: BrowserContext, urlText: string): Promise<void> {
-        await webActions.verifyNewWindowUrl(context, this.myAccountPageObjects.MY_ACCOUNT_FOLLOW_FB_LINK_XPATH, urlText);
-
+    async verifyFollowUsFBWindowAndClickMembers(context: BrowserContext, urlText: string): Promise<void> {
+        await webActions.verifyNewWindowUrlAndClick(context, this.myAccountPageObjects.MY_ACCOUNT_FOLLOW_FB_LINK_XPATH, urlText,this.myAccountPageObjects.MY_ACCOUNT_FB_MEMBERS_LINK_XPATH);
     }
 
 }

Diff for: tests/functional/FollowUsMultipleWindow.test.ts

@@ -4,5 +4,5 @@ test(`@Smoke Verify Follow Us Facebook new window.`, async ({ context, loginPage
     await loginPage.navigateToURL();
     await loginPage.loginToApplication();
     await myAccountPage.verifyMyAccountHeader();
-    await myAccountPage.verifyFollowUsFBWindow(context, "facebook");
+    await myAccountPage.verifyFollowUsFBWindowAndClickMembers(context, "facebook");
 });