floorp: fix policies test and refactor

tests/modules/programs/firefox/common.nix

@@ -0,0 +1,15 @@
+name:
+builtins.mapAttrs (test: module: import module [ "programs" name ]) {
+  "${name}-deprecated-native-messenger" = ./deprecated-native-messenger.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;
+}

tests/modules/programs/firefox/firefox.nix

@@ -1,16 +1 @@
-let name = "firefox";
-
-in builtins.mapAttrs (test: module: import module [ "programs" name ]) {
-  "${name}-deprecated-native-messenger" = ./deprecated-native-messenger.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;
-}
+import ./common.nix "firefox"

tests/modules/programs/firefox/floorp.nix

@@ -1,11 +1 @@
-let name = "floorp";
-
-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;
-}
+import ./common.nix "floorp"

tests/modules/programs/firefox/policies.nix

@@ -20,7 +20,7 @@ in {
     package = pkgs.${cfg.wrappedPackageName}.override {
       extraPolicies = { DownloadDirectory = "/foo"; };
     };
-  }) // {
+  } // {
     nmt.script = ''
       jq=${lib.getExe pkgs.jq}
       config_file="${cfg.finalPackage}/lib/${cfg.wrappedPackageName}/distribution/policies.json"
@@ -39,5 +39,5 @@ in {
         fail "Expected '$config_file' to set 'policies.DownloadDirectory' to \"/foo\""
       fi
     '';
-  };
+  });
 }