firefox: organize tests by submodule

nix-community · Oct 2, 2024 · 681e848 · 681e848
1 parent 437ec62
commit 681e848
Show file tree

Hide file tree

Showing 15 changed files with 285 additions and 224 deletions.
diff --git a/tests/modules/programs/firefox/firefox.nix b/tests/modules/programs/firefox/firefox.nix
@@ -1,11 +1,16 @@
 let name = "firefox";
 
 in builtins.mapAttrs (test: module: import module [ "programs" name ]) {
-  "${name}-profile-settings" = ./profile-settings.nix;
-  "${name}-state-version-19_09" = ./state-version-19_09.nix;
   "${name}-deprecated-native-messenger" = ./deprecated-native-messenger.nix;
-  "${name}-duplicate-profile-ids" = ./duplicate-profile-ids.nix;
-  "${name}-duplicate-container-ids" = ./duplicate-container-ids.nix;
-  "${name}-container-id-out-of-range" = ./container-id-out-of-range.nix;
   "${name}-policies" = ./policies.nix;
+  "${name}-profiles-bookmarks" = ./profiles/bookmarks;
+  "${name}-profiles-containers" = ./profiles/containers;
+  "${name}-profiles-containers-duplicate-ids" =
+    ./profiles/containers/duplicate-ids.nix;
+  "${name}-profiles-containers-id-out-of-range" =
+    ./profiles/containers/id-out-of-range.nix;
+  "${name}-profiles-duplicate-ids" = ./profiles/duplicate-ids.nix;
+  "${name}-profiles-search" = ./profiles/search;
+  "${name}-profiles-settings" = ./profiles/settings;
+  "${name}-state-version-19_09" = ./state-version-19_09.nix;
 }
diff --git a/tests/modules/programs/firefox/profile-settings.nix b/tests/modules/programs/firefox/profile-settings.nix
diff --git a/tests/modules/programs/firefox/profiles/bookmarks/default.nix b/tests/modules/programs/firefox/profiles/bookmarks/default.nix
@@ -0,0 +1,84 @@
+modulePath:
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = getAttrFromPath modulePath config;
+
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
+
+in {
+  imports = [ firefoxMockOverlay ];
+
+  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+    enable = true;
+    profiles.bookmarks = {
+      settings = { "general.smoothScroll" = false; };
+      bookmarks = [
+        {
+          toolbar = true;
+          bookmarks = [{
+            name = "Home Manager";
+            url = "https://wiki.nixos.org/wiki/Home_Manager";
+          }];
+        }
+        {
+          name = "wikipedia";
+          tags = [ "wiki" ];
+          keyword = "wiki";
+          url = "https://en.wikipedia.org/wiki/Special:Search?search=%s&go=Go";
+        }
+        {
+          name = "kernel.org";
+          url = "https://www.kernel.org";
+        }
+        {
+          name = "Nix sites";
+          bookmarks = [
+            {
+              name = "homepage";
+              url = "https://nixos.org/";
+            }
+            {
+              name = "wiki";
+              tags = [ "wiki" "nix" ];
+              url = "https://wiki.nixos.org/";
+            }
+            {
+              name = "Nix sites";
+              bookmarks = [
+                {
+                  name = "homepage";
+                  url = "https://nixos.org/";
+                }
+                {
+                  name = "wiki";
+                  url = "https://wiki.nixos.org/";
+                }
+              ];
+            }
+          ];
+        }
+      ];
+    };
+  } // {
+    nmt.script = ''
+      bookmarksUserJs=$(normalizeStorePaths \
+        home-files/${cfg.configPath}/bookmarks/user.js)
+
+      assertFileContent \
+        $bookmarksUserJs \
+        ${./expected-bookmarks-user.js}
+
+      bookmarksFile="$(sed -n \
+        '/browser.bookmarks.file/ {s|^.*\(/nix/store[^"]*\).*|\1|;p}' \
+        $TESTED/home-files/${cfg.configPath}/bookmarks/user.js)"
+
+      assertFileContent \
+        $bookmarksFile \
+        ${./expected-bookmarks.html}
+    '';
+  });
+}
diff --git a/...ofile-settings-expected-bookmarks-user.js → ...iles/bookmarks/expected-bookmarks-user.js b/...ofile-settings-expected-bookmarks-user.js → ...iles/bookmarks/expected-bookmarks-user.js
diff --git a/.../profile-settings-expected-bookmarks.html → ...rofiles/bookmarks/expected-bookmarks.html b/.../profile-settings-expected-bookmarks.html → ...rofiles/bookmarks/expected-bookmarks.html
diff --git a/tests/modules/programs/firefox/profiles/containers/default.nix b/tests/modules/programs/firefox/profiles/containers/default.nix
@@ -0,0 +1,32 @@
+modulePath:
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = getAttrFromPath modulePath config;
+
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
+
+in {
+  imports = [ firefoxMockOverlay ];
+
+  config = mkIf config.test.enableBig (setAttrByPath modulePath {
+    enable = true;
+    profiles.containers = {
+      containers = {
+        "shopping" = {
+          icon = "circle";
+          color = "yellow";
+        };
+      };
+    };
+  } // {
+    nmt.script = ''
+      assertFileContent \
+        home-files/${cfg.configPath}/containers/containers.json \
+        ${./expected-containers.json}
+    '';
+  });
+}
diff --git a/...grams/firefox/duplicate-container-ids.nix → ...fox/profiles/containers/duplicate-ids.nix b/...grams/firefox/duplicate-container-ids.nix → ...fox/profiles/containers/duplicate-ids.nix
@@ -7,7 +7,7 @@ let
 
   cfg = getAttrFromPath modulePath config;
 
-  firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 
 in {
   imports = [ firefoxMockOverlay ];

diff --git a/...profile-settings-expected-containers.json → ...files/containers/expected-containers.json b/...profile-settings-expected-containers.json → ...files/containers/expected-containers.json
@@ -1 +1 @@
-{"identities":[{"color":"yellow","icon":"circle","name":"shopping","public":true,"userContextId":6},{"accessKey":"","color":"","icon":"","name":"userContextIdInternal.thumbnail","public":false,"userContextId":4294967294},{"accessKey":"","color":"","icon":"","name":"userContextIdInternal.webextStorageLocal","public":false,"userContextId":4294967295}],"lastUserContextId":6,"version":4}
+{"identities":[{"color":"yellow","icon":"circle","name":"shopping","public":true,"userContextId":0},{"accessKey":"","color":"","icon":"","name":"userContextIdInternal.thumbnail","public":false,"userContextId":4294967294},{"accessKey":"","color":"","icon":"","name":"userContextIdInternal.webextStorageLocal","public":false,"userContextId":4294967295}],"lastUserContextId":0,"version":4}
diff --git a/...ams/firefox/container-id-out-of-range.nix → ...x/profiles/containers/id-out-of-range.nix b/...ams/firefox/container-id-out-of-range.nix → ...x/profiles/containers/id-out-of-range.nix
@@ -5,7 +5,7 @@ with lib;
 
 let
 
-  firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
+  firefoxMockOverlay = import ../../setup-firefox-mock-overlay.nix modulePath;
 
 in {
   imports = [ firefoxMockOverlay ];

diff --git a/...rograms/firefox/duplicate-profile-ids.nix → ...ograms/firefox/profiles/duplicate-ids.nix b/...rograms/firefox/duplicate-profile-ids.nix → ...ograms/firefox/profiles/duplicate-ids.nix
@@ -7,7 +7,7 @@ let
 
   cfg = getAttrFromPath modulePath config;
 
-  firefoxMockOverlay = import ./setup-firefox-mock-overlay.nix modulePath;
+  firefoxMockOverlay = import ../setup-firefox-mock-overlay.nix modulePath;
 
 in {
   imports = [ firefoxMockOverlay ];