From 3b43b1fa07fb3e6eeb22ff0855c3b154e5360344 Mon Sep 17 00:00:00 2001
From: Julian Descottes <jdescottes@mozilla.com>
Date: Thu, 8 Feb 2024 11:52:05 +0100
Subject: [PATCH] test: update user context tests checking the number of user
 contexts (#11877)

---
 test/TestExpectations.json      |  6 ++----
 test/src/browsercontext.spec.ts | 17 +++++++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/test/TestExpectations.json b/test/TestExpectations.json
index 4aa71911a7c..233f0223f4b 100644
--- a/test/TestExpectations.json
+++ b/test/TestExpectations.json
@@ -1476,8 +1476,7 @@
     "testIdPattern": "[browsercontext.spec] BrowserContext should create new incognito context",
     "platforms": ["darwin", "linux", "win32"],
     "parameters": ["firefox", "webDriverBiDi"],
-    "expectations": ["FAIL"],
-    "comment": "Fails because test assumes there is 1 user context initially, Firefox has 5"
+    "expectations": ["PASS"]
   },
   {
     "testIdPattern": "[browsercontext.spec] BrowserContext should fire target events",
@@ -1496,8 +1495,7 @@
     "testIdPattern": "[browsercontext.spec] BrowserContext should have default context",
     "platforms": ["darwin", "linux", "win32"],
     "parameters": ["firefox", "webDriverBiDi"],
-    "expectations": ["FAIL"],
-    "comment": "Fails because test assumes there is 1 user context initially, Firefox has 5"
+    "expectations": ["PASS"]
   },
   {
     "testIdPattern": "[browsercontext.spec] BrowserContext should timeout waiting for a non-existent target",
diff --git a/test/src/browsercontext.spec.ts b/test/src/browsercontext.spec.ts
index 2b637e4e327..2994b649112 100644
--- a/test/src/browsercontext.spec.ts
+++ b/test/src/browsercontext.spec.ts
@@ -18,9 +18,13 @@ describe('BrowserContext', function () {
     const {browser} = await getTestState({
       skipContextCreation: true,
     });
-    expect(browser.browserContexts()).toHaveLength(1);
-    const defaultContext = browser.browserContexts()[0]!;
-    expect(defaultContext!.isIncognito()).toBe(false);
+
+    expect(browser.browserContexts().length).toBeGreaterThanOrEqual(1);
+    const defaultContext = browser.browserContexts().find(context => {
+      return !context.isIncognito();
+    });
+    expect(defaultContext).toBeDefined();
+
     let error!: Error;
     await defaultContext!.close().catch(error_ => {
       return (error = error_);
@@ -33,13 +37,14 @@ describe('BrowserContext', function () {
       skipContextCreation: true,
     });
 
-    expect(browser.browserContexts()).toHaveLength(1);
+    const contextCount = browser.browserContexts().length;
+    expect(contextCount).toBeGreaterThanOrEqual(1);
     const context = await browser.createBrowserContext();
     expect(context.isIncognito()).toBe(true);
-    expect(browser.browserContexts()).toHaveLength(2);
+    expect(browser.browserContexts()).toHaveLength(contextCount + 1);
     expect(browser.browserContexts().indexOf(context) !== -1).toBe(true);
     await context.close();
-    expect(browser.browserContexts()).toHaveLength(1);
+    expect(browser.browserContexts()).toHaveLength(contextCount);
   });
   it('should close all belonging targets once closing context', async () => {
     const {browser} = await getTestState({