From f7eb845df0cc80f9bac6d6cd806ebfe5b0ed2dca Mon Sep 17 00:00:00 2001
From: Dmitry Gozman <dgozman@gmail.com>
Date: Sat, 7 Nov 2020 18:21:26 -0800
Subject: [PATCH] feat(firefox): bump to 1204, add a better test for video in
 popup (#4376)

---
 browsers.json           |  2 +-
 test/screencast.spec.ts | 53 +++++++++++++++++++++++------------------
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/browsers.json b/browsers.json
index 8432a6cdf9..079e44bb52 100644
--- a/browsers.json
+++ b/browsers.json
@@ -8,7 +8,7 @@
     },
     {
       "name": "firefox",
-      "revision": "1203",
+      "revision": "1204",
       "download": true
     },
     {
diff --git a/test/screencast.spec.ts b/test/screencast.spec.ts
index 8e9c992f7d..19ee716f25 100644
--- a/test/screencast.spec.ts
+++ b/test/screencast.spec.ts
@@ -135,6 +135,24 @@ function findVideos(videoDir: string) {
   return files.filter(file => file.endsWith('webm')).map(file => path.join(videoDir, file));
 }
 
+function expectRedFrames(videoFile: string, size: { width: number, height: number }) {
+  const videoPlayer = new VideoPlayer(videoFile);
+  const duration = videoPlayer.duration;
+  expect(duration).toBeGreaterThan(0);
+
+  expect(videoPlayer.videoWidth).toBe(size.width);
+  expect(videoPlayer.videoHeight).toBe(size.height);
+
+  {
+    const pixels = videoPlayer.seekLastFrame().data;
+    expectAll(pixels, almostRed);
+  }
+  {
+    const pixels = videoPlayer.seekLastFrame({ x: size.width - 20, y: 0 }).data;
+    expectAll(pixels, almostRed);
+  }
+}
+
 describe('screencast', suite => {
   suite.slow();
 }, () => {
@@ -158,12 +176,7 @@ describe('screencast', suite => {
     await context.close();
 
     const videoFile = await page.video().path();
-    const videoPlayer = new VideoPlayer(videoFile);
-    const duration = videoPlayer.duration;
-    expect(duration).toBeGreaterThan(0);
-
-    expect(videoPlayer.videoWidth).toBe(450);
-    expect(videoPlayer.videoHeight).toBe(240);
+    expectRedFrames(videoFile, size);
   });
 
   it('should throw without recordVideo.dir', async ({ browser }) => {
@@ -187,21 +200,7 @@ describe('screencast', suite => {
     await context.close();
 
     const videoFile = await page.video().path();
-    const videoPlayer = new VideoPlayer(videoFile);
-    const duration = videoPlayer.duration;
-    expect(duration).toBeGreaterThan(0);
-
-    expect(videoPlayer.videoWidth).toBe(450);
-    expect(videoPlayer.videoHeight).toBe(240);
-
-    {
-      const pixels = videoPlayer.seekLastFrame().data;
-      expectAll(pixels, almostRed);
-    }
-    {
-      const pixels = videoPlayer.seekLastFrame({ x: 430, y: 0}).data;
-      expectAll(pixels, almostRed);
-    }
+    expectRedFrames(videoFile, size);
   });
 
   it('should expose video path', async ({browser, testInfo}) => {
@@ -322,22 +321,30 @@ describe('screencast', suite => {
 
   it('should work for popups', async ({browser, testInfo, server}) => {
     const videosPath = testInfo.outputPath('');
+    const size = { width: 450, height: 240 };
     const context = await browser.newContext({
       recordVideo: {
         dir: videosPath,
-        size: { width: 320, height: 240 }
+        size,
       },
+      viewport: size,
     });
 
     const page = await context.newPage();
     await page.goto(server.EMPTY_PAGE);
-    await Promise.all([
+    const [popup] = await Promise.all([
       page.waitForEvent('popup'),
       page.evaluate(() => { window.open('about:blank'); }),
     ]);
+    await popup.evaluate(() => document.body.style.backgroundColor = 'red');
     await new Promise(r => setTimeout(r, 1000));
     await context.close();
 
+    const pageVideoFile = await page.video().path();
+    const popupVideoFile = await popup.video().path();
+    expect(pageVideoFile).not.toEqual(popupVideoFile);
+    expectRedFrames(popupVideoFile, size);
+
     const videoFiles = findVideos(videosPath);
     expect(videoFiles.length).toBe(2);
   });