rework tests

Author: zenoli

wrapperModules/d/direnv/check.nix

@@ -5,18 +5,6 @@
 
 let
   lib = pkgs.lib;
-  # wrapperWithoutNixDirenv = self.wrappers.direnv.wrap {
-  #   inherit pkgs;
-  #   nix-direnv.enable = true;
-  # };
-  # wrapperWithNixDirenv = self.wrappers.direnv.wrap {
-  #   inherit pkgs;
-  #   nix-direnv.enable = true;
-  # };
-  # TODO: This seems dumb. Is there no better way to do this?
-  # cfg = (wrapperWithNixDirenv.eval { }).config;
-  # dotdir = "${wrapperWithNixDirenv}/${cfg.configDirname}";
-
   testUtils = ''
     is_directory() {
       local path="$1"
@@ -40,25 +28,35 @@ let
   '';
 
   runTest =
-    name: attrs: script:
-    pkgs.runCommand name attrs ''
+    name: script:
+    pkgs.runCommand name { } ''
       ${testUtils}
 
       ${script}
 
       touch $out
     '';
 
-  runCheck = name: (import ./checks/${name}) { inherit pkgs self runTest; };
+  runTests =
+    name: tests:
+    runTest "test-group-${name}" ''
+      # "${lib.concatStringsSep " " tests}"
+    '';
+
+  runCheck =
+    name:
+    (import ./checks/${name}) {
+      inherit
+        pkgs
+        self
+        runTest
+        runTests
+        ;
+    };
   checks = lib.pipe ./checks [
     builtins.readDir
     (lib.filterAttrs (name: type: type == "regular"))
     (lib.mapAttrsToList (name: _: (runCheck name)))
   ];
 in
-# TODO: We need to return a derivation.
-# Create a dummie derivation that references `checks` to
-# ensure they are evaluated.
-runTest "all-tests" { } ''
-  # "${lib.concatStringsSep " " checks}"
-''
+runTests "direnv-all" checks

wrapperModules/d/direnv/checks/nix-direnv.nix

@@ -2,21 +2,43 @@
   pkgs,
   self,
   runTest,
+  runTests,
 }:
 
 let
-  wrapper = self.wrappers.direnv.wrap {
-    inherit pkgs;
-    nix-direnv.enable = true;
-  };
-  # TODO: This seems dumb. Is there no better way to do this?
-  cfg = (wrapper.eval { }).config;
-  dotdir = "${wrapper}/${cfg.configDirname}";
-
-  test = runTest "direnv-test" { } ''
-    "${wrapper}/bin/direnv" --version | grep -q "${wrapper.version}"
-    is_directory "${dotdir}"
-    is_file "${dotdir}/lib/nix-direnv.sh"
-  '';
+  getDotdir =
+    wrapper:
+    let
+      cfg = (wrapper.eval { }).config;
+      dotdir = "${wrapper}/${cfg.configDirname}";
+    in
+    dotdir;
 in
-test
+runTests "nix-direnv" [
+  (runTest "if nix-direnv is enabled then lib/nix-direnv.sh exists" (
+    let
+      wrapper = self.wrappers.direnv.wrap {
+        inherit pkgs;
+        nix-direnv.enable = true;
+      };
+    in
+    ''
+      "${wrapper}/bin/direnv" --version | grep -q "${wrapper.version}"
+      is_directory "${getDotdir wrapper}"
+      is_file "${getDotdir wrapper}/lib/nix-direnv.sh"
+    ''
+  ))
+  (runTest "if nix-direnv is diabled then lib/nix-direnv.sh does note exist" (
+    let
+      wrapper = self.wrappers.direnv.wrap {
+        inherit pkgs;
+        nix-direnv.enable = false;
+      };
+    in
+    ''
+      "${wrapper}/bin/direnv" --version | grep -q "${wrapper.version}"
+      is_directory "${getDotdir wrapper}"
+      ! is_file "${getDotdir wrapper}/lib/nix-direnv.sh"
+    ''
+  ))
+]