fix: let implementing modules specify revision fallbacks

electron-userland · May 24, 2019 · 9a3d720 · 9a3d720
1 parent 9410835
commit 9a3d720
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/defaults.js b/src/defaults.js
@@ -2,7 +2,14 @@
 
 const getHomePage = require('./gethomepage')
 
-module.exports = function getDefaultsFromPackageJSON (pkg) {
+/**
+ * Generate default configuration values from the given parsed `package.json`.
+ *
+ * @param pkg - the parsed `package.json` file
+ * @param fallbacks (optional) - fallback default value for certain options, currently:
+ * * `revision`
+ */
+module.exports = function getDefaultsFromPackageJSON (pkg, fallbacks = {}) {
   return {
     arch: undefined,
     bin: pkg.name || 'electron',
@@ -19,6 +26,6 @@ module.exports = function getDefaultsFromPackageJSON (pkg) {
     name: pkg.name || 'electron',
     productDescription: pkg.productDescription || pkg.description,
     productName: pkg.productName || pkg.name,
-    revision: pkg.revision || '1'
+    revision: pkg.revision || fallbacks.revision
   }
 }
diff --git a/test/defaults.js b/test/defaults.js
@@ -20,7 +20,7 @@ test('empty package.json', t => {
     name: 'electron',
     productDescription: undefined,
     productName: undefined,
-    revision: '1'
+    revision: undefined
   })
 })
 
@@ -46,6 +46,11 @@ test('description and product description specified', t => {
   t.is(defaults.productDescription, 'Product')
 })
 
+test('revision not specified with a fallback specified', t => {
+  const { revision } = getDefaultsFromPackageJSON({}, { revision: '1' })
+  t.is(revision, '1')
+})
+
 test('revision specified', t => {
   const defaults = getDefaultsFromPackageJSON({ revision: '7' })
   t.is(defaults.revision, '7')