From 07d72f57f6012d32611e878dd05a8b860de015ec Mon Sep 17 00:00:00 2001
From: Jean-Yves Avenard <jyavenard@mozilla.com>
Date: Sun, 26 Apr 2020 10:42:24 +0000
Subject: [PATCH] Bug 1630192 - Wait for the page to load before attempting to
 retrieve element. r=Gijs

Differential Revision: https://phabricator.services.mozilla.com/D72506
---
 .../test/browser_947914_button_addons.js            | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/browser/components/customizableui/test/browser_947914_button_addons.js b/browser/components/customizableui/test/browser_947914_button_addons.js
index 3f4019ab7bd9..6977c36ddad9 100644
--- a/browser/components/customizableui/test/browser_947914_button_addons.js
+++ b/browser/components/customizableui/test/browser_947914_button_addons.js
@@ -5,7 +5,6 @@
 "use strict";
 
 var initialLocation = gBrowser.currentURI.spec;
-var newTab = null;
 
 add_task(async function() {
   CustomizableUI.addWidgetToArea(
@@ -23,10 +22,14 @@ add_task(async function() {
   ok(addonsButton, "Add-ons button exists in Panel Menu");
   addonsButton.click();
 
-  newTab = gBrowser.selectedTab;
-  await TestUtils.waitForCondition(
-    () => gBrowser.currentURI && gBrowser.currentURI.spec == "about:addons"
-  );
+  await Promise.all([
+    TestUtils.waitForCondition(
+      () => gBrowser.currentURI && gBrowser.currentURI.spec == "about:addons"
+    ),
+    new Promise(r =>
+      gBrowser.selectedBrowser.addEventListener("load", r, true)
+    ),
+  ]);
 
   let addonsPage = gBrowser.selectedBrowser.contentWindow.document.getElementById(
     "addons-page"