From 7e928eb3ccf62a898cebe5d85d878b5b208ccd00 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 18 Feb 2025 12:14:10 +0100
Subject: [PATCH] bump version to 1.9.19 and update branding display name
 variable; remove obsolete test files

---
 package.json                            |  2 +-
 src/commands/export-file.test.ts        | 16 ----------------
 src/commands/package.ts                 |  2 +-
 src/commands/setup-project.test.ts      | 21 ---------------------
 src/utils/version.test.ts               | 15 ---------------
 template/branding.optional/configure.sh |  2 +-
 template/configs/common/mozconfig       |  1 -
 7 files changed, 3 insertions(+), 56 deletions(-)
 delete mode 100644 src/commands/export-file.test.ts
 delete mode 100644 src/commands/setup-project.test.ts
 delete mode 100644 src/utils/version.test.ts

diff --git a/package.json b/package.json
index eac7aa8..4da9100 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zen-browser/surfer",
-  "version": "1.9.18",
+  "version": "1.9.19",
   "description": "Simplifying building firefox forks!",
   "main": "index.js",
   "bin": {
diff --git a/src/commands/export-file.test.ts b/src/commands/export-file.test.ts
deleted file mode 100644
index bfb7419..0000000
--- a/src/commands/export-file.test.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-import { getPatchName } from './export-file'
-
-describe('getPatchName', () => {
-  it('works on root files', () => {
-    const name = getPatchName('foo.js')
-    expect(name).toBe('foo-js.patch')
-  })
-
-  it('works on embedded files', () => {
-    const name = getPatchName('foo/bar.js')
-    expect(name).toBe('bar-js.patch')
-  })
-})
diff --git a/src/commands/package.ts b/src/commands/package.ts
index c0c46be..0165bea 100644
--- a/src/commands/package.ts
+++ b/src/commands/package.ts
@@ -162,7 +162,7 @@ function getCurrentBrandName(): string {
     return 'Nightly'
   }
 
-  return config.brands[brand].brandFullName
+  return config.brands[brand].brandShortName
 }
 
 async function createMarFile(
diff --git a/src/commands/setup-project.test.ts b/src/commands/setup-project.test.ts
deleted file mode 100644
index 78543d3..0000000
--- a/src/commands/setup-project.test.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { shouldSkipOptionalCopy } from './setup-project'
-
-describe('shouldSkipOptionalCopy', () => {
-  it('Returns true if the file is not optional', () => {
-    expect(
-      shouldSkipOptionalCopy('something/somethingelse', ["doesn't matter"])
-    ).toBe(true)
-  })
-
-  it('Returns true if the file is not in the array', () => {
-    expect(
-      shouldSkipOptionalCopy('something/somethingelse.optional', ['not_here'])
-    ).toBe(true)
-  })
-
-  it('Returns false if the file is optional and in the array', () => {
-    expect(
-      shouldSkipOptionalCopy('something/somethingelse.optional', ['something'])
-    ).toBe(false)
-  })
-})
diff --git a/src/utils/version.test.ts b/src/utils/version.test.ts
deleted file mode 100644
index 92de07f..0000000
--- a/src/utils/version.test.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import { validProducts } from './config'
-import { getLatestFF } from './version'
-
-const firefoxVersions = validProducts
-
-describe('getLatestFF', () => {
-  for (const firefoxVersion of firefoxVersions) {
-    it(`returns the latest ${firefoxVersion} version`, async () =>
-      expect(await getLatestFF(firefoxVersion)).toBeTruthy())
-  }
-})
diff --git a/template/branding.optional/configure.sh b/template/branding.optional/configure.sh
index 33099e9..9d02db6 100644
--- a/template/branding.optional/configure.sh
+++ b/template/branding.optional/configure.sh
@@ -2,7 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-MOZ_APP_DISPLAYNAME="${brandFullName}"
+MOZ_APP_DISPLAYNAME="${brandShortName}"
 
 if test "$DEVELOPER_OPTIONS"; then
   if test "$MOZ_DEBUG"; then
diff --git a/template/configs/common/mozconfig b/template/configs/common/mozconfig
index 47ab3f4..7d04c63 100644
--- a/template/configs/common/mozconfig
+++ b/template/configs/common/mozconfig
@@ -3,7 +3,6 @@ export MOZ_USER_DIR="${name}"
 export MOZ_APP_VENDOR="${vendor}"
 export MOZ_APP_BASENAME=${binName}
 export MOZ_APP_PROFILE=${binName}
-export MOZ_APP_DISPLAYNAME="${name}"
 export MOZ_MACBUNDLE_ID=${appId}
 export MOZ_DISTRIBUTION_ID=${appId}