From 208089cb6b9f90deb73bec90203d4f14a61747b9 Mon Sep 17 00:00:00 2001
From: Jon Perl <perl.jonathan@gmail.com>
Date: Sun, 16 Aug 2020 19:49:35 -0600
Subject: [PATCH] fix: page context

---
 src/build-code/buildStepLines.ts       | 21 ++++++++++++++++-----
 test/build-code/buildStepLines.test.ts |  2 +-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/build-code/buildStepLines.ts b/src/build-code/buildStepLines.ts
index e78d24a4b..2701b16eb 100644
--- a/src/build-code/buildStepLines.ts
+++ b/src/build-code/buildStepLines.ts
@@ -33,7 +33,10 @@ export const buildValue = ({ action, value }: Step): string => {
   return JSON.stringify(value);
 };
 
-export const buildExpressionLine = (step: Step, frameVariable?: string): string => {
+export const buildExpressionLine = (
+  step: Step,
+  frameVariable?: string,
+): string => {
   const { action, event } = step;
 
   const args: string[] = [escapeSelector(event.selector)];
@@ -57,7 +60,7 @@ export const buildStepLines = (
   buildContext: StepLineBuildContext = {
     initializedFrames: new Map<string, string>(),
     initializedPages: new Set(),
-  }
+  },
 ): string[] => {
   const lines: string[] = [];
 
@@ -66,7 +69,9 @@ export const buildStepLines = (
 
   const pageVariableName = getStepPageVariableName(step);
   if (page > 0 && !initializedPages.has(page)) {
-    lines.push(`const ${pageVariableName} = await qawolf.waitForPage(context, ${page});`);
+    lines.push(
+      `const ${pageVariableName} = await qawolf.waitForPage(page.context(), ${page});`,
+    );
     initializedPages.add(page);
   }
 
@@ -74,8 +79,14 @@ export const buildStepLines = (
   if (frameSelector) {
     frameVariableName = initializedFrames.get(frameSelector);
     if (!frameVariableName) {
-      frameVariableName = `frame${initializedFrames.size ? initializedFrames.size + 1 : ''}`;
-      lines.push(`const ${frameVariableName} = await (await ${pageVariableName}.$(${escapeSelector(frameSelector)})).contentFrame();`);
+      frameVariableName = `frame${
+        initializedFrames.size ? initializedFrames.size + 1 : ''
+      }`;
+      lines.push(
+        `const ${frameVariableName} = await (await ${pageVariableName}.$(${escapeSelector(
+          frameSelector,
+        )})).contentFrame();`,
+      );
       initializedFrames.set(frameSelector, frameVariableName);
     }
   }
diff --git a/test/build-code/buildStepLines.test.ts b/test/build-code/buildStepLines.test.ts
index 69862b670..b03df7a3a 100644
--- a/test/build-code/buildStepLines.test.ts
+++ b/test/build-code/buildStepLines.test.ts
@@ -37,7 +37,7 @@ describe('buildStepLines', () => {
 
     expect(lines).toMatchInlineSnapshot(`
       Array [
-        "const page2 = await qawolf.waitForPage(context, 1);",
+        "const page2 = await qawolf.waitForPage(page.context(), 1);",
         "await page2.click('[data-qa=\\"test-input\\"]');",
       ]
     `);