fix(jobPatched) Fixed some attributes not being passed into ci

Fixed modifying continuous integration settings attributes only when the job is configured via nix,
plus improved tests for this functionality.

lib/impl/jobPatched.nix

@@ -11,13 +11,11 @@ in
     pipelineName,
     nixConfig,
   }:
+    if ! nixConfig.enable then job else
     (builtins.removeAttrs job [ "variables" "cache" ])
-    // (optionalAttrs nixConfig.enable (
-      (prependToBeforeScript ["source setup_nix_ci \"gitlab-ci:pipeline:${pipelineName}:job-deps:${key}\""] job)
+    // (prependToBeforeScript [ "source setup_nix_ci \"gitlab-ci:pipeline:${pipelineName}:job-deps:${key}\"" ] job)
     // (appendToAfterScript [ "finalize_nix_ci" ] job)
-    ))
-    // optionalAttrs nixConfig.enable (
-      (let
+    // (let
       variables = job.variables or {} //
         optionalAttrs nixConfig.enableRunnerCache {
           NIX_CI_CACHE_STRATEGY = "runner";
@@ -28,9 +26,8 @@ in
         inherit variables;
       })
     // (let
-        cache =
-          (toList (job.cache or []))
-          ++ (optional nixConfig.enableRunnerCache {
+      cache = (toList (job.cache or [])) ++
+      (optional nixConfig.enableRunnerCache {
         key = nixConfig.runnerCacheKey;
         paths = [ ".nix-cache/" ];
       });
@@ -39,4 +36,3 @@ in
       optionalAttrs (cache != []) {
         inherit cache;
       })
-    )

tests/cilib_test.nix

@@ -57,14 +57,14 @@
       {
         name = "jobPatched nix disabled";
         expected = {
-          /*cache = [{
+          cache = [{
             name = "some";
             paths = [ "this" ];
           }];
           variables = {
             BASH = toString pkgs.bash;
             TEST = "work";
-          };*/
+          };
         };
         actual = mkJobPatched {
           key = "test";
@@ -206,14 +206,14 @@
             before_script = [ "./init" ];
             script = [ "echo Hello World!" ];
             after_script = [ "./clean" ];
-            /*cache = [{
+            cache = [{
               key = "simple";
               paths = [ "~/random/" ];
             }];
             variables = {
               SAMPLE = "working";
               HELLO = toString pkgs.hello;
-            };*/
+            };
           };
         };
         actual = (mkPipeline {