git-credential-oauth: fix use of mkIf and add tests

Closes #6005
nix-community · Oct 27, 2024 · 05d9bee · 05d9bee
1 parent 93435d2
commit 05d9bee
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 1 deletion.
diff --git a/modules/programs/git-credential-oauth.nix b/modules/programs/git-credential-oauth.nix
@@ -30,7 +30,8 @@ in {
     home.packages = [ cfg.package ];
 
     programs.git.extraConfig.credential.helper = [
-      ("${cfg.package}/bin/git-credential-oauth" + lib.mkIf cfg.extraFlags
+      ("${cfg.package}/bin/git-credential-oauth"
+        + lib.optionalString (cfg.extraFlags != [ ])
         " ${lib.strings.concatStringsSep " " cfg.extraFlags}")
     ];
   };

diff --git a/tests/default.nix b/tests/default.nix
@@ -81,6 +81,7 @@ in import nmtSrc {
     ./modules/programs/gh-dash
     ./modules/programs/git
     ./modules/programs/git-cliff
+    ./modules/programs/git-credential-oauth
     ./modules/programs/gpg
     ./modules/programs/gradle
     ./modules/programs/granted

diff --git a/tests/modules/programs/git-credential-oauth/basic.nix b/tests/modules/programs/git-credential-oauth/basic.nix
@@ -0,0 +1,16 @@
+{ config, pkgs, ... }:
+
+{
+  programs.git-credential-oauth = { enable = true; };
+
+  programs.git = { enable = true; };
+
+  test.stubs.git-credential-oauth = { };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/git/config
+    assertFileContains \
+      home-files/.config/git/config \
+      "${config.programs.git-credential-oauth.package}/bin/git-credential-oauth"
+  '';
+}
diff --git a/tests/modules/programs/git-credential-oauth/default.nix b/tests/modules/programs/git-credential-oauth/default.nix
@@ -0,0 +1,4 @@
+{
+  git-credential-oauth-basic = ./basic.nix;
+  git-credential-oauth-extra-flags = ./extra-flags.nix;
+}
diff --git a/tests/modules/programs/git-credential-oauth/extra-flags.nix b/tests/modules/programs/git-credential-oauth/extra-flags.nix
@@ -0,0 +1,19 @@
+{ config, pkgs, ... }:
+
+{
+  programs.git-credential-oauth = {
+    enable = true;
+    extraFlags = [ "-device" ];
+  };
+
+  programs.git = { enable = true; };
+
+  test.stubs.git-credential-oauth = { };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/git/config
+    assertFileContains \
+      home-files/.config/git/config \
+      "${config.programs.git-credential-oauth.package}/bin/git-credential-oauth -device"
+  '';
+}