git: update tests

tests/modules/programs/gh/credential-helper.git.conf

@@ -1,5 +1,17 @@
+[commit]
+	gpgSign = false
+
 [credential "https://github.com"]
 	helper = "@gh@/bin/gh auth git-credential"
 
 [credential "https://github.example.com"]
 	helper = "@gh@/bin/gh auth git-credential"
+
+[gpg]
+	format = "openpgp"
+
+[gpg "openpgp"]
+	program = "path-to-gpg"
+
+[tag]
+	gpgSign = false

tests/modules/programs/gh/credential-helper.nix

@@ -9,7 +9,10 @@
     };
   };
 
-  programs.git.enable = true;
+  programs.git = {
+    enable = true;
+    signing.signer = "path-to-gpg";
+  };
 
   test.stubs.gh = { };
 

tests/modules/programs/git/git-with-email-expected.conf

@@ -1,3 +1,12 @@
+[commit]
+	gpgSign = false
+
+[gpg]
+	format = "openpgp"
+
+[gpg "openpgp"]
+	program = "path-to-gpg"
+
 [sendemail "hm-account"]
 	from = "H. M. Test Jr. <hm@example.org>"
 	smtpEncryption = "tls"
@@ -12,6 +21,9 @@
 	smtpSslCertPath = "/etc/ssl/certs/ca-certificates.crt"
 	smtpUser = "home.manager"
 
+[tag]
+	gpgSign = false
+
 [user]
 	email = "hm@example.com"
 	name = "H. M. Test"

tests/modules/programs/git/git-with-email.nix

@@ -11,6 +11,7 @@ with lib;
     programs.git = {
       enable = true;
       package = pkgs.gitMinimal;
+      signing.signer = "path-to-gpg";
       userEmail = "hm@example.com";
       userName = "H. M. Test";
     };

tests/modules/programs/git/git-with-msmtp-expected.conf

@@ -1,3 +1,12 @@
+[commit]
+	gpgSign = false
+
+[gpg]
+	format = "openpgp"
+
+[gpg "openpgp"]
+	program = "path-to-gpg"
+
 [sendemail "hm-account"]
 	from = "H. M. Test Jr. <hm@example.org>"
 	smtpEncryption = "tls"
@@ -10,6 +19,9 @@
 	from = "H. M. Test <hm@example.com>"
 	smtpServer = "@msmtp@/bin/msmtp"
 
+[tag]
+	gpgSign = false
+
 [user]
 	email = "hm@example.com"
 	name = "H. M. Test"

tests/modules/programs/git/git-with-msmtp.nix

@@ -11,6 +11,7 @@ with lib;
     programs.git = {
       enable = true;
       package = pkgs.gitMinimal;
+      signing.signer = "path-to-gpg";
       userEmail = "hm@example.com";
       userName = "H. M. Test";
     };

tests/modules/programs/git/git-with-str-extra-config-expected.conf

@@ -1,5 +1,17 @@
 This can be anything.
 
+[commit]
+	gpgSign = false
+
+[gpg]
+	format = "openpgp"
+
+[gpg "openpgp"]
+	program = "path-to-gpg"
+
+[tag]
+	gpgSign = false
+
 [user]
 	email = "user@example.org"
 	name = "John Doe"

tests/modules/programs/git/git-with-str-extra-config.nix

@@ -7,6 +7,7 @@ with lib;
     programs.git = {
       enable = true;
       package = pkgs.gitMinimal;
+      signing.signer = "path-to-gpg";
       extraConfig = ''
         This can be anything.
       '';

tests/modules/programs/git/git-without-signing-key-id-expected.conf

@@ -2,6 +2,9 @@
 	gpgSign = true
 
 [gpg]
+	format = "openpgp"
+
+[gpg "openpgp"]
 	program = "path-to-gpg"
 
 [tag]

tests/modules/programs/git/git-without-signing-key-id.nix

@@ -6,7 +6,7 @@
       userEmail = "user@example.org";
 
       signing = {
-        gpgPath = "path-to-gpg";
+        signer = "path-to-gpg";
         key = null;
         signByDefault = true;
       };