From 8336e6d0839fa4b22ad0a2035da5280bfb97a0ce Mon Sep 17 00:00:00 2001
From: Skryta Istota <6970043-hidden-being@users.noreply.gitlab.com>
Date: Wed, 3 Dec 2025 16:55:05 +0100
Subject: [PATCH] tests(modules_test) Extended test definition for modules

Extended the definition of tests for the continuous integration modules,
allowing for more in-depth testing of odd behavior of some configuration generators.
---
 tests/modules_test.nix | 47 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/tests/modules_test.nix b/tests/modules_test.nix
index e134293..e56ad34 100644
--- a/tests/modules_test.nix
+++ b/tests/modules_test.nix
@@ -10,9 +10,17 @@
       simplePipeline = cilib.mkCI {
         pipelines."test" = {
           stages = ["test"];
+          variables = {
+            EXAMPLE = "empty";
+            CURL = toString pkgs.curl;
+          };
           jobs."test" = {
             stage = "test";
             script = ["echo hello world"];
+            variables = {
+              SAMPLE = "working";
+              HELLO = toString pkgs.hello;
+            };
           };
         };
       };
@@ -30,21 +38,29 @@
           (cilib.mkCI {}).packages;
       }
       {
-        name = "simple pipeline";
+        name = "simple pipeline final config";
         expected = {
           stages = [".pre" "test" ".post"];
+          variables = {
+            EXAMPLE = "empty";
+            CURL = toString pkgs.curl;
+          };
           "test" = {
             image = "$NIX_CI_IMAGE";
             stage = "test";
             before_script = ["source setup_nix_ci \"gitlab-ci:pipeline:test:job-deps:test\""];
             script = ["echo hello world"];
             after_script = ["finalize_nix_ci"];
+            variables = {
+              SAMPLE = "working";
+              #HELLO = toString pkgs.hello;
+            };
           };
         };
         actual = simplePipeline.pipelines."test".finalConfig;
       }
       {
-        name = "simple pipeline yaml";
+        name = "simple pipeline json";
         type = "script";
         script = let
           package = simplePipeline.packages."gitlab-ci:pipeline:test";
@@ -56,16 +72,36 @@
             assert_file_contains ${package} 'gitlab-ci:pipeline:test:job-deps:test'
             assert_file_contains ${package} 'finalize_nix_ci'
             assert_file_contains ${package} 'echo hello world'
+            assert_file_contains ${package} '"EXAMPLE":"empty"'
+            assert_file_contains ${package} '"SAMPLE":"working"'
+            assert_file_contains ${package} '"CURL":"/nix/store/.*-curl-.*"'
           '';
       }
       {
-        name = "dont fail on store paths";
+        name = "simple pipeline deps drv";
+        type = "script";
+        script = let
+          package = simplePipeline.packages."gitlab-ci:pipeline:test:job-deps:test";
+        in
+          # sh
+          ''
+            ${ntlib.helpers.path [pkgs.gnugrep]}
+            ${ntlib.helpers.scriptHelpers}
+            assert_file_contains ${package} ':$PATH'
+            assert_file_contains ${package} 'HELLO="/nix/store/.*-hello-.*"'
+          '';
+      }
+      {
+        name = "do not fail on store paths";
         type = "script";
         script = let
           package =
             (cilib.mkCI {
               pipelines."test" = {
-                variables.EXAMPLE = "${pkgs.hello}";
+                variables = {
+                  HELLO = "${pkgs.hello}";
+                  SAMPLE = "empty";
+                };
               };
             }).packages."gitlab-ci:pipeline:test";
         in
@@ -74,7 +110,8 @@
             ${ntlib.helpers.path [pkgs.gnugrep]}
             ${ntlib.helpers.scriptHelpers}
             assert_file_contains ${package} '[".pre",".post"]'
-            assert_file_contains ${package} '"EXAMPLE":"/nix/store/.*-hello-.*"'
+            assert_file_contains ${package} '"HELLO":"/nix/store/.*-hello-.*"'
+            assert_file_contains ${package} '"SAMPLE":"empty"'
           '';
       }
     ];