From 1f3a831cc3bf969a6005197d22e841f995665c0a Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Sun, 2 May 2021 15:04:12 -0400
Subject: [PATCH] remote_runner: Avoid duplication in task list

---
 src/tests/frontend/travis/remote_runner.js | 58 ++++++++++------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/src/tests/frontend/travis/remote_runner.js b/src/tests/frontend/travis/remote_runner.js
index b621ceeb2..98b4c1846 100644
--- a/src/tests/frontend/travis/remote_runner.js
+++ b/src/tests/frontend/travis/remote_runner.js
@@ -128,40 +128,36 @@ const sauceTestWorker = async.queue((testSettings, callback) => {
   });
 }, 6); // run 6 tests in parrallel
 
-if (!isAdminRunner) {
-  sauceTestWorker.push({
-    platform: 'Windows 10',
-    browserName: 'firefox',
-    version: '84.0',
-  });
-  sauceTestWorker.push({
-    platform: 'Windows 7',
-    browserName: 'chrome',
-    version: '55.0',
-    args: ['--use-fake-device-for-media-stream'],
-  });
-  sauceTestWorker.push({
+[
+  {
     platform: 'OS X 10.15',
     browserName: 'safari',
     version: '13.1',
-  });
-  sauceTestWorker.push({
-    platform: 'Windows 10',
-    browserName: 'microsoftedge',
-    version: '83.0',
-  });
-  sauceTestWorker.push({
-    platform: 'Windows 7',
-    browserName: 'firefox',
-    version: '78.0',
-  });
-} else {
-  sauceTestWorker.push({
-    platform: 'OS X 10.15',
-    browserName: 'safari',
-    version: '13.1',
-  });
-}
+  },
+  ...(isAdminRunner ? [] : [
+    {
+      platform: 'Windows 10',
+      browserName: 'firefox',
+      version: '84.0',
+    },
+    {
+      platform: 'Windows 7',
+      browserName: 'chrome',
+      version: '55.0',
+      args: ['--use-fake-device-for-media-stream'],
+    },
+    {
+      platform: 'Windows 10',
+      browserName: 'microsoftedge',
+      version: '83.0',
+    },
+    {
+      platform: 'Windows 7',
+      browserName: 'firefox',
+      version: '78.0',
+    },
+  ]),
+].forEach((task) => sauceTestWorker.push(task));
 
 sauceTestWorker.drain(() => {
   process.exit(allTestsPassed ? 0 : 1);