Switching to japanese for dmg-license tests since russian does not ha…

…ve a default label
electron-userland · Dec 2, 2020 · 5b7e9bd · 5b7e9bd
1 parent 1b8ea4f
commit 5b7e9bd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/packages/dmg-builder/src/dmgLicense.ts b/packages/dmg-builder/src/dmgLicense.ts
@@ -1,4 +1,5 @@
 import { exec, log } from "builder-util"
+import { safeLoad } from 'js-yaml'
 import { PlatformPackager } from "app-builder-lib"
 import { getLicenseFiles } from "app-builder-lib/out/util/license"
 import { outputFile, readFile, readJson } from "fs-extra"
@@ -9,6 +10,8 @@ import { dmgLicenseFromJSON } from 'dmg-license'
 // DropDMG/dmgbuild a in any case (even if no english, but only ru/de) set to 0 (en_US), well, without docs, just believe that's correct
 const DEFAULT_REGION_CODE = 0
 
+// License Specifications
+// https://github.com/argv-minus-one/dmg-license/blob/HEAD/docs/License%20Specifications.md
 type LicenseConfig = {
   '$schema': string
   body: any[]
@@ -26,7 +29,7 @@ export async function addLicenseToDmg(packager: PlatformPackager<any>, dmgPath:
   packager.debugLogger.add("dmg.licenseButtons", licenseButtonFiles)
 
   const jsonFile: LicenseConfig = {
-    '$schema': 'https://github.com/argv-minus-one/dmg-license/raw/master/schema.json',
+    "$schema": "https://github.com/argv-minus-one/dmg-license/raw/master/schema.json",
     // defaultLang: '',
     body: [],
     labels: []
@@ -40,7 +43,8 @@ export async function addLicenseToDmg(packager: PlatformPackager<any>, dmgPath:
   }
 
   for (const button of licenseButtonFiles) {
-    const label = await readJson(button.file)
+    const filepath = button.file
+    const label = filepath.endsWith(".yml") ? safeLoad(await readFile(filepath, "utf-8")) : await readJson(filepath)
     if (label.description) {
       // to support original button file format
       label.message = label.description

diff --git a/test/snapshots/mac/dmgTest.js.snap b/test/snapshots/mac/dmgTest.js.snap
@@ -2472,7 +2472,7 @@ Object {
 }
 `;
 
-exports[`license rtf 1`] = `
+exports[`license ja 1`] = `
 Object {
   "mac": Array [
     Object {
@@ -2496,7 +2496,7 @@ Object {
 }
 `;
 
-exports[`license rtf 2`] = `
+exports[`license ja 2`] = `
 Object {
   "CFBundleDisplayName": "Test App ßW",
   "CFBundleExecutable": "Test App ßW",
@@ -2532,7 +2532,7 @@ Object {
 }
 `;
 
-exports[`license ru 1`] = `
+exports[`license rtf 1`] = `
 Object {
   "mac": Array [
     Object {
@@ -2556,7 +2556,7 @@ Object {
 }
 `;
 
-exports[`license ru 2`] = `
+exports[`license rtf 2`] = `
 Object {
   "CFBundleDisplayName": "Test App ßW",
   "CFBundleExecutable": "Test App ßW",

diff --git a/test/src/mac/dmgTest.ts b/test/src/mac/dmgTest.ts
@@ -254,14 +254,14 @@ test.ifAll.ifMac("multi language license", app(packagerOptions, {
     return Promise.all([
       // writeFile(path.join(projectDir, "build", "license_en.txt"), "Hi"),
       fs.writeFile(path.join(projectDir, "build", "license_de.txt"), "Hallo"),
-      fs.writeFile(path.join(projectDir, "build", "license_ru.txt"), "Привет"),
+      fs.writeFile(path.join(projectDir, "build", "license_ja.txt"), "こんにちは"),
     ])
   },
 }))
 
-test.ifAll.ifMac("license ru", app(packagerOptions, {
+test.ifAll.ifMac("license ja", app(packagerOptions, {
   projectDirCreated: projectDir => {
-    return fs.writeFile(path.join(projectDir, "build", "license_ru.txt"), "Привет".repeat(12))
+    return fs.writeFile(path.join(projectDir, "build", "license_ja.txt"), "こんにちは".repeat(12))
   },
 }))