chore: avoid running npm install for fixtures (#1009)

We only need a subset of the modules available for tests, so stub them out instead.
electron · Jun 20, 2019 · 8356c07 · 8356c07
1 parent 99e28bb
commit 8356c07
Show file tree

Hide file tree

Showing 22 changed files with 34 additions and 23 deletions.
diff --git a/test/_setup.js b/test/_setup.js
@@ -63,28 +63,6 @@ async function preDownloadElectron () {
   await downloadMASLoginHelperElectronZip()
 }
 
-async function npmInstallForFixture (fixture) {
-  const fixtureDir = fixtureSubdir(fixture)
-  if (await fs.pathExists(path.join(fixtureDir, 'node_modules'))) {
-    return true
-  } else {
-    console.log(`Running npm install in fixtures/${fixture}...`)
-    return childProcess.exec('npm install --no-bin-links', { cwd: fixtureDir })
-  }
-}
-
-async function npmInstallForFixtures () {
-  const fixtures = [
-    'asar-prebuilt',
-    'basic',
-    'basic-renamed-to-electron',
-    'electron-in-dependencies',
-    'infer-missing-version-only',
-    'el-0374'
-  ]
-  return Promise.all(fixtures.map(npmInstallForFixture))
-}
-
 const WORK_CWD = path.join(__dirname, 'work')
 
 async function ensureEmptyWorkDirExists () {
@@ -97,7 +75,6 @@ module.exports = {
   setupTestsuite: async function setupTestsuite () {
     try {
       await preDownloadElectron()
-      await npmInstallForFixtures()
     } catch (error) {
       console.error(error.stack || error)
       return process.exit(1)

diff --git a/test/fixtures/asar-prebuilt/node_modules/electron/index.js b/test/fixtures/asar-prebuilt/node_modules/electron/index.js
diff --git a/test/fixtures/asar-prebuilt/node_modules/electron/package.json b/test/fixtures/asar-prebuilt/node_modules/electron/package.json
diff --git a/test/fixtures/basic-renamed-to-electron/node_modules/electron-prebuilt/package.json b/test/fixtures/basic-renamed-to-electron/node_modules/electron-prebuilt/package.json
diff --git a/test/fixtures/basic-renamed-to-electron/node_modules/electron/index.js b/test/fixtures/basic-renamed-to-electron/node_modules/electron/index.js
diff --git a/test/fixtures/basic-renamed-to-electron/node_modules/electron/package.json b/test/fixtures/basic-renamed-to-electron/node_modules/electron/package.json
diff --git a/test/fixtures/basic/node_modules/@types/node/package.json b/test/fixtures/basic/node_modules/@types/node/package.json
diff --git a/test/fixtures/basic/node_modules/electron-prebuilt/index.js b/test/fixtures/basic/node_modules/electron-prebuilt/index.js
diff --git a/test/fixtures/basic/node_modules/electron-prebuilt/package.json b/test/fixtures/basic/node_modules/electron-prebuilt/package.json
diff --git a/test/fixtures/basic/node_modules/ncp/package.json b/test/fixtures/basic/node_modules/ncp/package.json
diff --git a/test/fixtures/basic/node_modules/run-series/package.json b/test/fixtures/basic/node_modules/run-series/package.json
diff --git a/test/fixtures/basic/node_modules/run-waterfall/package.json b/test/fixtures/basic/node_modules/run-waterfall/package.json
diff --git a/test/fixtures/el-0374/node_modules/@types/node/package.json b/test/fixtures/el-0374/node_modules/@types/node/package.json
diff --git a/test/fixtures/el-0374/node_modules/electron-prebuilt/index.js b/test/fixtures/el-0374/node_modules/electron-prebuilt/index.js
diff --git a/test/fixtures/el-0374/node_modules/electron-prebuilt/package.json b/test/fixtures/el-0374/node_modules/electron-prebuilt/package.json
diff --git a/test/fixtures/el-0374/node_modules/ncp/package.json b/test/fixtures/el-0374/node_modules/ncp/package.json
diff --git a/test/fixtures/el-0374/node_modules/run-series/package.json b/test/fixtures/el-0374/node_modules/run-series/package.json
diff --git a/test/fixtures/el-0374/node_modules/run-waterfall/package.json b/test/fixtures/el-0374/node_modules/run-waterfall/package.json
diff --git a/test/fixtures/electron-in-dependencies/node_modules/electron/index.js b/test/fixtures/electron-in-dependencies/node_modules/electron/index.js
diff --git a/test/fixtures/electron-in-dependencies/node_modules/electron/package.json b/test/fixtures/electron-in-dependencies/node_modules/electron/package.json
diff --git a/test/fixtures/infer-missing-version-only/node_modules/electron/index.js b/test/fixtures/infer-missing-version-only/node_modules/electron/index.js
diff --git a/test/fixtures/infer-missing-version-only/node_modules/electron/package.json b/test/fixtures/infer-missing-version-only/node_modules/electron/package.json