From 6c7f755452e1bbdb5d92cbdcd9efb6b6e6202e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Go=C5=82=C4=99biowski-Owczarek?=
 <m.goleb@gmail.com>
Date: Fri, 6 Sep 2024 18:49:52 +0200
Subject: [PATCH] Tests: Run tests on both real Firefox ESRs

1. At the same time, there may be two supported versions of Firefox ESR. Run
   tests on both, installed locally.
2. Contrary to what we did in gh-5547, still run tests on Firefox 115 on
   BrowserStack - on `main`, we deleted it since we support only the versions
   supported upstream. In jQuery 3.x, we're testing on all versions matching ESR
   lines starting with Firefox 48, so for consistency let's keep Firefox 115
   there as well.

Closes gh-5548
Ref gh-5547
---
 .github/workflows/node.js.yml | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index 283104b2e..769166eb2 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -37,7 +37,10 @@ jobs:
           - NAME: "Chrome"
             NODE_VERSION: "20.x"
             NPM_SCRIPT: "test:amd"
-          - NAME: "Firefox ESR"
+          - NAME: "Firefox ESR (new)"
+            NODE_VERSION: "20.x"
+            NPM_SCRIPT: "test:firefox"
+          - NAME: "Firefox ESR (old)"
             NODE_VERSION: "20.x"
             NPM_SCRIPT: "test:firefox"
     steps:
@@ -57,10 +60,21 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-npm-lock-
 
-      - name: Install firefox ESR
+      - name: Set download URL for Firefox ESR (old)
+        run: |
+          echo "FIREFOX_SOURCE_URL=https://download.mozilla.org/?product=firefox-esr-latest-ssl&lang=en-US&os=linux64" >> "$GITHUB_ENV"
+        if: contains(matrix.NAME, 'Firefox ESR (old)')
+
+      - name: Set download URL for Firefox ESR (new)
+        run: |
+          echo "FIREFOX_SOURCE_URL=https://download.mozilla.org/?product=firefox-esr-next-latest-ssl&lang=en-US&os=linux64" >> "$GITHUB_ENV"
+        if: contains(matrix.NAME, 'Firefox ESR (new)')
+
+      - name: Install Firefox ESR
         run: |
-          export FIREFOX_SOURCE_URL='https://download.mozilla.org/?product=firefox-esr-latest-ssl&lang=en-US&os=linux64'
           wget --no-verbose $FIREFOX_SOURCE_URL -O - | tar -jx -C ${HOME}
+          echo "PATH=${HOME}/firefox:$PATH" >> "$GITHUB_ENV"
+          echo "FIREFOX_BIN=${HOME}/firefox/firefox" >> "$GITHUB_ENV"
         if: contains(matrix.NAME, 'Firefox ESR')
 
       - name: Install dependencies
@@ -71,10 +85,7 @@ jobs:
         if: contains(matrix.NPM_SCRIPT, 'lint')
 
       - name: Run tests
-        run: |
-          export PATH=${HOME}/firefox:$PATH
-          export FIREFOX_BIN=${HOME}/firefox/firefox
-          npm run ${{ matrix.NPM_SCRIPT }}
+        run: npm run ${{ matrix.NPM_SCRIPT }}
 
   safari:
     runs-on: macos-latest