From c82cc36a49b094f195e3e9c8a3d5b1c29a68c4be Mon Sep 17 00:00:00 2001
From: Mark Lee <electronjs@lazymalevolence.com>
Date: Sun, 25 Feb 2018 14:24:03 -0800
Subject: [PATCH] Pre-download the MAS version being tested

---
 test/_setup.js | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/test/_setup.js b/test/_setup.js
index 34235ef5..a9b2f6bf 100644
--- a/test/_setup.js
+++ b/test/_setup.js
@@ -13,26 +13,42 @@ function fixtureSubdir (subdir) {
   return path.join(__dirname, 'fixtures', subdir)
 }
 
+/**
+ * Skip testing darwin/mas target on Windows since Electron Packager itself skips it
+ * (see https://github.com/electron-userland/electron-packager/issues/71)
+ */
+function skipDownloadingMacZips (platform, arch) {
+  return common.isPlatformMac(platform) && process.platform === 'win32'
+}
+
 function downloadAll (version) {
   console.log(`Calling electron-download for ${version} before running tests...`)
-  const combinations = download.createDownloadCombos({electronVersion: config.version, all: true}, targets.officialPlatforms, targets.officialArchs, (platform, arch) => {
-    // Skip testing darwin/mas target on Windows since electron-packager itself skips it
-    // (see https://github.com/electron-userland/electron-packager/issues/71)
-    return common.isPlatformMac(platform) && process.platform === 'win32'
-  })
+  const combinations = download.createDownloadCombos({electronVersion: config.version, all: true}, targets.officialPlatforms, targets.officialArchs, skipDownloadingMacZips)
+
+  return Promise.all(combinations.map(combination => downloadElectronZip(version, combination)))
+}
 
-  return Promise.all(combinations.map(combination => {
-    return download.downloadElectronZip(Object.assign({}, combination, {
-      cache: path.join(os.homedir(), '.electron'),
-      quiet: !!process.env.CI,
-      version: version
-    }))
+function downloadElectronZip (version, options) {
+  return download.downloadElectronZip(Object.assign({}, options, {
+    cache: path.join(os.homedir(), '.electron'),
+    quiet: !!process.env.CI,
+    version: version
   }))
 }
 
-// Download all Electron distributions before running tests to avoid timing out due to network
-// speed. Most tests run with the config.json version, but we have some tests using 0.37.4, and an
-// electron module specific test using 1.3.1.
+function downloadMASLoginHelperElectronZip () {
+  if (process.platform !== 'win32') {
+    const version = '2.0.0-beta.1'
+    console.log(`Calling electron-download for ${version} (MAS only) before running tests...`)
+    return downloadElectronZip(version, { platform: 'mas', arch: 'x64' })
+  }
+}
+
+/**
+ * Download all Electron distributions before running tests to avoid timing out due to network
+ * speed. Most tests run with the config.json version, but we have some tests using 0.37.4, an
+ * `electron` module specific test using 1.3.1., and an MAS-specific test using 2.0.0-beta.1.
+ */
 function preDownloadElectron () {
   const versions = [
     config.version,
@@ -40,6 +56,7 @@ function preDownloadElectron () {
     '1.3.1'
   ]
   return Promise.all(versions.map(downloadAll))
+    .then(downloadMASLoginHelperElectronZip)
 }
 
 function npmInstallForFixture (fixture) {