Skip to content

feat(lib/utils.js): support firefox esr #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
servusdei2018 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat(lib/utils.js): support firefox esr #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbf58f9
feat(lib/utils.js): support firefox esr
servusdei2018 Jan 17, 2026
94cc9a2
fix(test/run/test.utils.js): support ESR in binary normalization
servusdei2018 Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function normalizeBinary (binaryPath, platform, arch) {
if (platform === "osx") {
var result = null;
var channelNames = [
"firefox", "firefoxdeveloperedition", "beta", "nightly", "aurora"
"firefox", "firefoxdeveloperedition", "beta", "nightly", "aurora", "esr"
];

if (channelNames.indexOf(binaryPath) !== -1) {
Expand Down Expand Up @@ -121,6 +121,7 @@ normalizeBinary.paths = {
"firefoxdeveloperedition on osx": "/Applications/Firefox Developer Edition.app/Contents/MacOS/firefox",
"aurora on osx": "/Applications/FirefoxAurora.app/Contents/MacOS/firefox",
"nightly on osx": "/Applications/Firefox Nightly.app/Contents/MacOS/firefox",
"esr on osx": "/Applications/Firefox ESR.app/Contents/MacOS/firefox",
};

normalizeBinary.appNames = {
Expand All @@ -129,12 +130,14 @@ normalizeBinary.appNames = {
"aurora on linux": "firefox-aurora",
"firefoxdeveloperedition on linux": "firefox-developer-edition",
"nightly on linux": "firefox-nightly",
"esr on linux": "firefox-esr",
"firefox on windows": "Mozilla Firefox",
// the default path in the beta installer is the same as the stable one
"beta on windows": "Mozilla Firefox",
"firefoxdeveloperedition on windows": "Firefox Developer Edition",
"aurora on windows": "Aurora",
"nightly on windows": "Nightly"
"nightly on windows": "Nightly",
"esr on windows": "Mozilla Firefox ESR"
};

exports.normalizeBinary = normalizeBinary;
Expand Down
15 changes: 13 additions & 2 deletions test/run/test.utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,9 @@ describe("lib/utils", function () {
if (options.key.toLowerCase().indexOf("aurora") != -1) {
value = "aurora";
}
if (options.key.toLowerCase().indexOf("esr") != -1) {
value = "Mozilla Firefox ESR";
}
this.get = function(_, fn) {
fn(null, {value: value});
};
Expand All @@ -233,7 +236,9 @@ describe("lib/utils", function () {
[["nightly", "windows", "x86"], "nightly"],
[["nightly", "windows", "x86_64"], "nightly"],
[["aurora", "windows", "x86"], "aurora"],
[["aurora", "windows", "x86_64"], "aurora"]
[["aurora", "windows", "x86_64"], "aurora"],
[["esr", "windows", "x86"], "Mozilla Firefox ESR"],
[["esr", "windows", "x86_64"], "Mozilla Firefox ESR"]
].map(function(fixture) {
var promise = binary.apply(binary, fixture[args]);
return promise.then(function(actual) {
Expand Down Expand Up @@ -268,6 +273,9 @@ describe("lib/utils", function () {

[["nightly", "linux", "x86_64"], "/usr/bin/firefox-nightly"],
[["nightly", "linux", "x86_64"], "/usr/bin/firefox-nightly"],

[["esr", "linux", "x86"], "/usr/bin/firefox-esr"],
[["esr", "linux", "x86_64"], "/usr/bin/firefox-esr"],
].map(function(fixture) {
var promise = binary.apply(binary, fixture[args]);
return promise.then(function(actual) {
Expand Down Expand Up @@ -298,7 +306,10 @@ describe("lib/utils", function () {
[["aurora", "darwin", "x86_64"], "/Applications/FirefoxAurora.app/Contents/MacOS/firefox"],

[["nightly", "darwin", "x86"], "/Applications/Firefox Nightly.app/Contents/MacOS/firefox"],
[["nightly", "darwin", "x86_64"], "/Applications/Firefox Nightly.app/Contents/MacOS/firefox"]
[["nightly", "darwin", "x86_64"], "/Applications/Firefox Nightly.app/Contents/MacOS/firefox"],

[["esr", "darwin", "x86"], "/Applications/Firefox ESR.app/Contents/MacOS/firefox"],
[["esr", "darwin", "x86_64"], "/Applications/Firefox ESR.app/Contents/MacOS/firefox"]
].map(function (fixture) {
var promise = binary.apply(binary, fixture[args]);
return promise.then(function(actual) {
Expand Down