From 262da92bbb366ab8f94a0bc4cfdd39418e31779a Mon Sep 17 00:00:00 2001
From: Jack Franklin <jacktfranklin@chromium.org>
Date: Wed, 8 Apr 2020 11:18:29 +0100
Subject: [PATCH] chore(test): re-enable Firefox testing on CI (#5608)

---
 .travis.yml           | 13 +++++++++++++
 utils/browser/test.js |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d0acc8f516165..286b8348e1288 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,3 +21,16 @@ jobs:
         - "export DISPLAY=:99.0"
         - "sh -e /etc/init.d/xvfb start"
       script: ./travis/chromium.sh
+    - node_js: "10.19.0"
+      dist: trusty
+      env:
+        - FIREFOX=true
+        - FIREFOX_HOME=$TRAVIS_HOME/firefox-latest
+      before_install:
+        - "export DISPLAY=:99.0"
+        - "sh -e /etc/init.d/xvfb start"
+        - "pyenv shell 3.6 && pip3 install --user mozdownload"
+        - "rm -rf $FIREFOX_HOME && mozdownload -t daily -d $FIREFOX_HOME/latest.tar.bz --log-level DEBUG"
+        - "cd $FIREFOX_HOME; tar -xvf latest.tar.bz; cd -; ls $FIREFOX_HOME/firefox/firefox"
+      script:
+        -  "BINARY=$FIREFOX_HOME/firefox/firefox npm run funit"
diff --git a/utils/browser/test.js b/utils/browser/test.js
index 2f10acf7b3678..09d5022587b2d 100644
--- a/utils/browser/test.js
+++ b/utils/browser/test.js
@@ -72,6 +72,8 @@ describe('Puppeteer-Web', () => {
     await session.send('Target.exposeDevToolsProtocol', {targetId: pageInfo.targetId});
     await session.detach();
 
+    await new Promise(resolve => setTimeout(resolve, 1000));
+
     // Use in-page puppeteer to create a new page and navigate it to the EMPTY_PAGE
     await page.evaluate(async serverConfig  => {
       const puppeteer = require('puppeteer');