From d86720b7dc0c20a0aac92875981ed45bfa8ce77d Mon Sep 17 00:00:00 2001
From: Tim van der Meij <timvandermeij@gmail.com>
Date: Sat, 18 Apr 2020 16:12:50 +0200
Subject: [PATCH] Identify browsers using the name instead of the path

The other testing code already uses the name of the browser as the
unique identifier, so I don't see a good reason to not use that for
identifying browsers to quit as well. Doing so simplifies the (already
somewhat complex) testing logic and ensures that we can use existing
functionality (such as the `getSession` function) to retrieve sessions.
---
 test/driver.js            | 11 ++---------
 test/font/jasmine-boot.js |  5 +----
 test/test.js              |  6 +-----
 test/unit/jasmine-boot.js |  5 +----
 test/unit/testreporter.js |  4 ++--
 5 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/test/driver.js b/test/driver.js
index f86db197d..53729a785 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -300,7 +300,6 @@ var Driver = (function DriverClosure() {
     var parameters = this._getQueryStringParameters();
     this.browser = parameters.browser;
     this.manifestFile = parameters.manifestFile;
-    this.appPath = parameters.path;
     this.delay = parameters.delay | 0 || 0;
     this.inFlightRequests = 0;
     this.testFilter = parameters.testFilter
@@ -340,13 +339,7 @@ var Driver = (function DriverClosure() {
         );
       };
       this._info("User agent: " + navigator.userAgent);
-      this._log(
-        'Harness thinks this browser is "' +
-          this.browser +
-          '" with path "' +
-          this.appPath +
-          '"\n'
-      );
+      this._log(`Harness thinks this browser is ${this.browser}\n`);
       this._log('Fetching manifest "' + this.manifestFile + '"... ');
 
       var r = new XMLHttpRequest();
@@ -679,7 +672,7 @@ var Driver = (function DriverClosure() {
 
       // Send the quit request
       var r = new XMLHttpRequest();
-      r.open("POST", "/tellMeToQuit?path=" + escape(this.appPath), false);
+      r.open("POST", `/tellMeToQuit?browser=${escape(this.browser)}`, false);
       r.onreadystatechange = function (e) {
         if (r.readyState === 4) {
           window.close();
diff --git a/test/font/jasmine-boot.js b/test/font/jasmine-boot.js
index 6b20acef9..d8249cff5 100644
--- a/test/font/jasmine-boot.js
+++ b/test/font/jasmine-boot.js
@@ -119,10 +119,7 @@ function initializePDFJS(callback) {
   env.addReporter(htmlReporter);
 
   if (queryString.getParam("browser")) {
-    var testReporter = new TestReporter(
-      queryString.getParam("browser"),
-      queryString.getParam("path")
-    );
+    var testReporter = new TestReporter(queryString.getParam("browser"));
     env.addReporter(testReporter);
   }
 
diff --git a/test/test.js b/test/test.js
index 79d147052..5cd86a195 100644
--- a/test/test.js
+++ b/test/test.js
@@ -617,11 +617,7 @@ function refTestPostHandler(req, res) {
 
     var session;
     if (pathname === "/tellMeToQuit") {
-      // finding by path
-      var browserPath = parsedUrl.query.path;
-      session = sessions.filter(function (curSession) {
-        return curSession.config.path === browserPath;
-      })[0];
+      session = getSession(parsedUrl.query.browser);
       monitorBrowserTimeout(session, null);
       closeSession(session.name);
       return;
diff --git a/test/unit/jasmine-boot.js b/test/unit/jasmine-boot.js
index c414ba1fb..01ab57afc 100644
--- a/test/unit/jasmine-boot.js
+++ b/test/unit/jasmine-boot.js
@@ -175,10 +175,7 @@ function initializePDFJS(callback) {
   env.addReporter(htmlReporter);
 
   if (queryString.getParam("browser")) {
-    var testReporter = new TestReporter(
-      queryString.getParam("browser"),
-      queryString.getParam("path")
-    );
+    var testReporter = new TestReporter(queryString.getParam("browser"));
     env.addReporter(testReporter);
   }
 
diff --git a/test/unit/testreporter.js b/test/unit/testreporter.js
index 0733a307d..c74825ae2 100644
--- a/test/unit/testreporter.js
+++ b/test/unit/testreporter.js
@@ -1,7 +1,7 @@
 "use strict";
 
 // eslint-disable-next-line no-unused-vars
-var TestReporter = function (browser, appPath) {
+var TestReporter = function (browser) {
   function send(action, json, cb) {
     var r = new XMLHttpRequest();
     // (The POST URI is ignored atm.)
@@ -39,7 +39,7 @@ var TestReporter = function (browser, appPath) {
   }
 
   function sendQuitRequest() {
-    send("/tellMeToQuit?path=" + escape(appPath), {});
+    send(`/tellMeToQuit?browser=${escape(browser)}`, {});
   }
 
   this.now = function () {