From d21bee5abf9fb4a42b2fa7728bf671f8bb246ba6 Mon Sep 17 00:00:00 2001 From: Timothy Gallion Date: Sat, 3 Jan 2026 12:45:16 -0500 Subject: [PATCH] floorp: Fix tests for floorp-bin change Several of the `floorp` tests were broken by the upstream switch to `floorp-bin`. Most changes were to do with not being able to use `programs.floorp.wrappedPackageName` in expected results. --- tests/modules/programs/firefox/policies.nix | 2 +- tests/modules/programs/firefox/profiles/bookmarks/default.nix | 2 +- tests/modules/programs/firefox/profiles/search/default.nix | 2 +- tests/modules/programs/firefox/setup-firefox-mock-overlay.nix | 1 + tests/modules/programs/firefox/state-version-19_09.nix | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/modules/programs/firefox/policies.nix b/tests/modules/programs/firefox/policies.nix index 8832b8f2..cce5fa71 100644 --- a/tests/modules/programs/firefox/policies.nix +++ b/tests/modules/programs/firefox/policies.nix @@ -37,7 +37,7 @@ in if pkgs.stdenv.hostPlatform.isDarwin then "${cfg.finalPackage}/${darwinPath}" else - "${cfg.finalPackage}/lib/${cfg.wrappedPackageName}"; + "${cfg.finalPackage}/lib/${cfg.finalPackage.unwrapped.libName or cfg.wrappedPackageName}"; config_file = "${libDir}/distribution/policies.json"; in '' diff --git a/tests/modules/programs/firefox/profiles/bookmarks/default.nix b/tests/modules/programs/firefox/profiles/bookmarks/default.nix index a66e1a68..fb6e13d2 100644 --- a/tests/modules/programs/firefox/profiles/bookmarks/default.nix +++ b/tests/modules/programs/firefox/profiles/bookmarks/default.nix @@ -92,7 +92,7 @@ in if pkgs.stdenv.hostPlatform.isDarwin then "${cfg.finalPackage}/${darwinPath}" else - "${cfg.finalPackage}/lib/${cfg.wrappedPackageName}"; + "${cfg.finalPackage}/lib/${cfg.finalPackage.unwrapped.libName or cfg.wrappedPackageName}"; config_file = "${libDir}/distribution/policies.json"; in '' diff --git a/tests/modules/programs/firefox/profiles/search/default.nix b/tests/modules/programs/firefox/profiles/search/default.nix index 979c25f2..56eac7f3 100644 --- a/tests/modules/programs/firefox/profiles/search/default.nix +++ b/tests/modules/programs/firefox/profiles/search/default.nix @@ -19,7 +19,7 @@ let substitutions = [ "--replace" "@name@" - cfg.wrappedPackageName + cfg.package.meta.mainProgram ]; }; diff --git a/tests/modules/programs/firefox/setup-firefox-mock-overlay.nix b/tests/modules/programs/firefox/setup-firefox-mock-overlay.nix index 6077c3c1..04fffd24 100644 --- a/tests/modules/programs/firefox/setup-firefox-mock-overlay.nix +++ b/tests/modules/programs/firefox/setup-firefox-mock-overlay.nix @@ -25,6 +25,7 @@ in binaryName = cfg.wrappedPackageName; gtk3 = null; meta.description = "I pretend to be ${cfg.name}"; + meta.mainProgram = lib.toLower cfg.name; }; outPath = null; buildScript = diff --git a/tests/modules/programs/firefox/state-version-19_09.nix b/tests/modules/programs/firefox/state-version-19_09.nix index 3da8f137..93c357b7 100644 --- a/tests/modules/programs/firefox/state-version-19_09.nix +++ b/tests/modules/programs/firefox/state-version-19_09.nix @@ -21,7 +21,7 @@ in // { nmt.script = '' assertFileRegex \ - home-path/bin/${cfg.wrappedPackageName} \ + home-path/bin/${cfg.finalPackage.meta.mainProgram} \ MOZ_APP_LAUNCHER ''; }