From fbba21b525c41dcddab78c2c46f17c5047d51ae8 Mon Sep 17 00:00:00 2001 From: DavHau Date: Mon, 14 Nov 2022 15:42:35 +0100 Subject: [PATCH] chore: rename directory of flake based integration tests --- flake.nix | 7 +++++++ tests/{integration => integration-d2n-flakes}/default.nix | 0 .../tests/.gitignore | 0 .../tests/nodejs_built-binary/flake.nix | 0 .../tests/nodejs_built-binary/package.json | 0 .../tests/nodejs_dependency-versions-mismatch/flake.nix | 0 .../tests/nodejs_dependency-versions-mismatch/package.json | 0 .../tests/nodejs_dependency-versions-mismatch/yarn.lock | 0 .../tests/nodejs_direct-priority-over-transitive/flake.nix | 0 .../nodejs_direct-priority-over-transitive/package.json | 0 10 files changed, 7 insertions(+) rename tests/{integration => integration-d2n-flakes}/default.nix (100%) rename tests/{integration => integration-d2n-flakes}/tests/.gitignore (100%) rename tests/{integration => integration-d2n-flakes}/tests/nodejs_built-binary/flake.nix (100%) rename tests/{integration => integration-d2n-flakes}/tests/nodejs_built-binary/package.json (100%) rename tests/{integration => integration-d2n-flakes}/tests/nodejs_dependency-versions-mismatch/flake.nix (100%) rename tests/{integration => integration-d2n-flakes}/tests/nodejs_dependency-versions-mismatch/package.json (100%) rename tests/{integration => integration-d2n-flakes}/tests/nodejs_dependency-versions-mismatch/yarn.lock (100%) rename tests/{integration => integration-d2n-flakes}/tests/nodejs_direct-priority-over-transitive/flake.nix (100%) rename tests/{integration => integration-d2n-flakes}/tests/nodejs_direct-priority-over-transitive/package.json (100%) diff --git a/flake.nix b/flake.nix index 2c493478..623dc3c8 100644 --- a/flake.nix +++ b/flake.nix @@ -218,6 +218,13 @@ inherit self; }); + tests-integration-d2n-flakes.type = "app"; + tests-integration-d2n-flakes.program = + b.toString + (dream2nixFor."${system}".callPackageDream ./tests/integration-d2n-flakes { + inherit self; + }); + tests-examples.type = "app"; tests-examples.program = b.toString diff --git a/tests/integration/default.nix b/tests/integration-d2n-flakes/default.nix similarity index 100% rename from tests/integration/default.nix rename to tests/integration-d2n-flakes/default.nix diff --git a/tests/integration/tests/.gitignore b/tests/integration-d2n-flakes/tests/.gitignore similarity index 100% rename from tests/integration/tests/.gitignore rename to tests/integration-d2n-flakes/tests/.gitignore diff --git a/tests/integration/tests/nodejs_built-binary/flake.nix b/tests/integration-d2n-flakes/tests/nodejs_built-binary/flake.nix similarity index 100% rename from tests/integration/tests/nodejs_built-binary/flake.nix rename to tests/integration-d2n-flakes/tests/nodejs_built-binary/flake.nix diff --git a/tests/integration/tests/nodejs_built-binary/package.json b/tests/integration-d2n-flakes/tests/nodejs_built-binary/package.json similarity index 100% rename from tests/integration/tests/nodejs_built-binary/package.json rename to tests/integration-d2n-flakes/tests/nodejs_built-binary/package.json diff --git a/tests/integration/tests/nodejs_dependency-versions-mismatch/flake.nix b/tests/integration-d2n-flakes/tests/nodejs_dependency-versions-mismatch/flake.nix similarity index 100% rename from tests/integration/tests/nodejs_dependency-versions-mismatch/flake.nix rename to tests/integration-d2n-flakes/tests/nodejs_dependency-versions-mismatch/flake.nix diff --git a/tests/integration/tests/nodejs_dependency-versions-mismatch/package.json b/tests/integration-d2n-flakes/tests/nodejs_dependency-versions-mismatch/package.json similarity index 100% rename from tests/integration/tests/nodejs_dependency-versions-mismatch/package.json rename to tests/integration-d2n-flakes/tests/nodejs_dependency-versions-mismatch/package.json diff --git a/tests/integration/tests/nodejs_dependency-versions-mismatch/yarn.lock b/tests/integration-d2n-flakes/tests/nodejs_dependency-versions-mismatch/yarn.lock similarity index 100% rename from tests/integration/tests/nodejs_dependency-versions-mismatch/yarn.lock rename to tests/integration-d2n-flakes/tests/nodejs_dependency-versions-mismatch/yarn.lock diff --git a/tests/integration/tests/nodejs_direct-priority-over-transitive/flake.nix b/tests/integration-d2n-flakes/tests/nodejs_direct-priority-over-transitive/flake.nix similarity index 100% rename from tests/integration/tests/nodejs_direct-priority-over-transitive/flake.nix rename to tests/integration-d2n-flakes/tests/nodejs_direct-priority-over-transitive/flake.nix diff --git a/tests/integration/tests/nodejs_direct-priority-over-transitive/package.json b/tests/integration-d2n-flakes/tests/nodejs_direct-priority-over-transitive/package.json similarity index 100% rename from tests/integration/tests/nodejs_direct-priority-over-transitive/package.json rename to tests/integration-d2n-flakes/tests/nodejs_direct-priority-over-transitive/package.json