From 5d52bbbfa78c4be203dfdd2739ea3b03d914b9f8 Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Mon, 31 Oct 2022 11:49:44 -0700 Subject: [PATCH] test: add test for detect forge.config --- .../api/core/test/fast/resolve-dir_spec.ts | 7 ++++++ .../forge.config.js | 22 +++++++++++++++++++ .../package.json | 7 ++++++ 3 files changed, 36 insertions(+) create mode 100644 packages/api/core/test/fixture/forge-config-no-package-json-config/forge.config.js create mode 100644 packages/api/core/test/fixture/forge-config-no-package-json-config/package.json diff --git a/packages/api/core/test/fast/resolve-dir_spec.ts b/packages/api/core/test/fast/resolve-dir_spec.ts index e4c4a021b5..93bb098775 100644 --- a/packages/api/core/test/fast/resolve-dir_spec.ts +++ b/packages/api/core/test/fast/resolve-dir_spec.ts @@ -9,6 +9,13 @@ describe('resolve-dir', () => { expect(await resolveDir('/foo/var/fake')).to.be.equal(null); }); + it('should return a directory if a forge config is found, but no package.json.forge.config', async () => { + expect(await resolveDir(path.resolve(__dirname, '../fixture/forge-config-no-package-json-config/'))).to.not.be.equal(null); + expect(await resolveDir(path.resolve(__dirname, '../fixture/forge-config-no-package-json-config/'))).to.be.equal( + path.resolve(__dirname, '../fixture/forge-config-no-package-json-config') + ); + }); + it('should return a directory if it finds a node module', async () => { expect(await resolveDir(path.resolve(__dirname, '../fixture/dummy_app/foo'))).to.not.be.equal(null); expect(await resolveDir(path.resolve(__dirname, '../fixture/dummy_app/foo'))).to.be.equal(path.resolve(__dirname, '../fixture/dummy_app')); diff --git a/packages/api/core/test/fixture/forge-config-no-package-json-config/forge.config.js b/packages/api/core/test/fixture/forge-config-no-package-json-config/forge.config.js new file mode 100644 index 0000000000..9a4060f97e --- /dev/null +++ b/packages/api/core/test/fixture/forge-config-no-package-json-config/forge.config.js @@ -0,0 +1,22 @@ +module.exports = { + packagerConfig: {}, + rebuildConfig: {}, + makers: [ + { + name: '@electron-forge/maker-squirrel', + config: {}, + }, + { + name: '@electron-forge/maker-zip', + platforms: ['darwin'], + }, + { + name: '@electron-forge/maker-deb', + config: {}, + }, + { + name: '@electron-forge/maker-rpm', + config: {}, + }, + ], +}; diff --git a/packages/api/core/test/fixture/forge-config-no-package-json-config/package.json b/packages/api/core/test/fixture/forge-config-no-package-json-config/package.json new file mode 100644 index 0000000000..db8ec52f37 --- /dev/null +++ b/packages/api/core/test/fixture/forge-config-no-package-json-config/package.json @@ -0,0 +1,7 @@ +{ + "name": "test", + "devDependencies": { + "electron": "^1000.0.0", + "@electron-forge/cli": "6.0.0" + } +}