From e495cd8c805a050d404abcb658cfe8cdaf589990 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 21 Feb 2025 20:41:22 -0800 Subject: [PATCH] tests/firefox: add profiles-extensions (#6510) Wasn't actually running test because it wasn't included. Also had to fix test after some of the recent changes. --- tests/modules/programs/firefox/common.nix | 1 + .../firefox/profiles/extensions/default.nix | 25 +++++++++++-------- .../profiles/extensions/expected-storage.js | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/tests/modules/programs/firefox/common.nix b/tests/modules/programs/firefox/common.nix index 939eab949..7dca728a9 100644 --- a/tests/modules/programs/firefox/common.nix +++ b/tests/modules/programs/firefox/common.nix @@ -11,6 +11,7 @@ builtins.mapAttrs (test: module: import module [ "programs" name ]) { "${name}-profiles-containers-id-out-of-range" = ./profiles/containers/id-out-of-range.nix; "${name}-profiles-duplicate-ids" = ./profiles/duplicate-ids.nix; + "${name}-profiles-extensions" = ./profiles/extensions; "${name}-profiles-overwrite" = ./profiles/overwrite; "${name}-profiles-search" = ./profiles/search; "${name}-profiles-settings" = ./profiles/settings; diff --git a/tests/modules/programs/firefox/profiles/extensions/default.nix b/tests/modules/programs/firefox/profiles/extensions/default.nix index 577518390..7f181b4fd 100644 --- a/tests/modules/programs/firefox/profiles/extensions/default.nix +++ b/tests/modules/programs/firefox/profiles/extensions/default.nix @@ -1,5 +1,5 @@ modulePath: -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; let cfg = getAttrFromPath modulePath config; @@ -11,20 +11,25 @@ in { config = mkIf config.test.enableBig (setAttrByPath modulePath { enable = true; profiles.extensions = { - extensions.settings."uBlock0@raymondhill.net".settings = { - selectedFilterLists = [ - "ublock-filters" - "ublock-badware" - "ublock-privacy" - "ublock-unbreak" - "ublock-quick-fixes" - ]; + extensions = { + force = true; + settings = { + "uBlock0@raymondhill.net".settings = { + selectedFilterLists = [ + "ublock-filters" + "ublock-badware" + "ublock-privacy" + "ublock-unbreak" + "ublock-quick-fixes" + ]; + }; + }; }; }; } // { nmt.script = '' assertFileContent \ - home-files/${cfg.configPath}/extensions/uBlock0@raymondhill.net/storage.js \ + home-files/${cfg.configPath}/extensions/browser-extension-data/uBlock0@raymondhill.net/storage.js \ ${./expected-storage.js} ''; }); diff --git a/tests/modules/programs/firefox/profiles/extensions/expected-storage.js b/tests/modules/programs/firefox/profiles/extensions/expected-storage.js index 66c2a8d0f..225234411 100644 --- a/tests/modules/programs/firefox/profiles/extensions/expected-storage.js +++ b/tests/modules/programs/firefox/profiles/extensions/expected-storage.js @@ -1 +1 @@ -{"selectedFilterLists":["ublock-filters","ublock-badware","ublock-privacy","ublock-unbreak","ublock-quick-fixes"]} +{"selectedFilterLists":["ublock-filters","ublock-badware","ublock-privacy","ublock-unbreak","ublock-quick-fixes"]} \ No newline at end of file