From b4c4f17cc975a092861472296d262a1e2ba0b238 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 17 Feb 2019 19:42:01 +0100
Subject: [PATCH] feat: refactor tests

---
 default.nix                                     | 1 +
 release.nix                                     | 2 +-
 test/modules/testing.nix => testing/default.nix | 0
 {test/modules => testing}/test.nix              | 0
 {test => tests}/default.nix                     | 2 +-
 {test => tests}/k8s/1.13/crd.nix                | 0
 {test => tests}/k8s/crd.nix                     | 0
 {test => tests}/k8s/deployment.nix              | 0
 {test => tests}/k8s/simple.nix                  | 0
 {test => tests}/submodules/simple.nix           | 0
 10 files changed, 3 insertions(+), 2 deletions(-)
 rename test/modules/testing.nix => testing/default.nix (100%)
 rename {test/modules => testing}/test.nix (100%)
 rename {test => tests}/default.nix (97%)
 rename {test => tests}/k8s/1.13/crd.nix (100%)
 rename {test => tests}/k8s/crd.nix (100%)
 rename {test => tests}/k8s/deployment.nix (100%)
 rename {test => tests}/k8s/simple.nix (100%)
 rename {test => tests}/submodules/simple.nix (100%)

diff --git a/default.nix b/default.nix
index e090ba3..f635e4b 100644
--- a/default.nix
+++ b/default.nix
@@ -27,5 +27,6 @@ let
     submodules = ./submodules.nix;
     k8s = ./k8s;
     istio = ./istio;
+    testing = ./testing;
   };
 in kubenix
diff --git a/release.nix b/release.nix
index b8c360e..a20ae43 100644
--- a/release.nix
+++ b/release.nix
@@ -45,7 +45,7 @@ in {
     path = generateIstio ./istio/istio-schema.json;
   }];
 
-  test = import ./test {
+  tests = import ./tests {
     inherit pkgs lib kubenix;
   };
 
diff --git a/test/modules/testing.nix b/testing/default.nix
similarity index 100%
rename from test/modules/testing.nix
rename to testing/default.nix
diff --git a/test/modules/test.nix b/testing/test.nix
similarity index 100%
rename from test/modules/test.nix
rename to testing/test.nix
diff --git a/test/default.nix b/tests/default.nix
similarity index 97%
rename from test/default.nix
rename to tests/default.nix
index a79711c..bb7cca0 100644
--- a/test/default.nix
+++ b/tests/default.nix
@@ -12,7 +12,7 @@ listToAttrs (map (version: let
   version' = replaceStrings ["."] ["_"] version;
 in nameValuePair "v${version'}" (evalModules {
   modules = [
-    ./modules/testing.nix
+    kubenix.testing
 
     {
       imports = [kubenix.k8s kubenix.submodules];
diff --git a/test/k8s/1.13/crd.nix b/tests/k8s/1.13/crd.nix
similarity index 100%
rename from test/k8s/1.13/crd.nix
rename to tests/k8s/1.13/crd.nix
diff --git a/test/k8s/crd.nix b/tests/k8s/crd.nix
similarity index 100%
rename from test/k8s/crd.nix
rename to tests/k8s/crd.nix
diff --git a/test/k8s/deployment.nix b/tests/k8s/deployment.nix
similarity index 100%
rename from test/k8s/deployment.nix
rename to tests/k8s/deployment.nix
diff --git a/test/k8s/simple.nix b/tests/k8s/simple.nix
similarity index 100%
rename from test/k8s/simple.nix
rename to tests/k8s/simple.nix
diff --git a/test/submodules/simple.nix b/tests/submodules/simple.nix
similarity index 100%
rename from test/submodules/simple.nix
rename to tests/submodules/simple.nix