From 9e448b7ff002505774c53b815726edbb677afea6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 27 Sep 2023 10:43:23 +0200 Subject: [PATCH] tests: allow test cases to use the nixvim helpers (for testing them) --- tests/fetch-tests.nix | 5 +++-- tests/test-sources/example-configurations/issues.nix | 2 +- tests/test-sources/examples.nix | 2 +- tests/test-sources/modules/clipboard.nix | 2 +- tests/test-sources/plugins/languages/nvim-jdtls.nix | 2 +- .../plugins/languages/treesitter/treesitter-context.nix | 2 +- .../test-sources/plugins/languages/treesitter/treesitter.nix | 2 +- tests/test-sources/plugins/lsp/nvim-lsp.nix | 2 +- tests/test-sources/plugins/statuslines/lualine.nix | 2 +- tests/test-sources/plugins/utils/alpha.nix | 2 +- 10 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tests/fetch-tests.nix b/tests/fetch-tests.nix index 55b76278..c3bd1597 100644 --- a/tests/fetch-tests.nix +++ b/tests/fetch-tests.nix @@ -35,6 +35,7 @@ # Remove the nesting testsList = lib.lists.flatten (parseDirectories root []); + helpers = import ../lib/helpers.nix {inherit lib;}; testsListEvaluated = builtins.map ({ cases, namespace, @@ -42,8 +43,8 @@ if builtins.isAttrs cases then args else { - # cases = cases {inherit pkgs;}; - cases = cases {inherit pkgs;}; + # cases is a function + cases = cases {inherit pkgs helpers;}; inherit namespace; }) testsList; diff --git a/tests/test-sources/example-configurations/issues.nix b/tests/test-sources/example-configurations/issues.nix index 0edbef66..0a561192 100644 --- a/tests/test-sources/example-configurations/issues.nix +++ b/tests/test-sources/example-configurations/issues.nix @@ -1,4 +1,4 @@ -{pkgs}: { +{pkgs, ...}: { "40" = { plugins = { nix.enable = true; diff --git a/tests/test-sources/examples.nix b/tests/test-sources/examples.nix index 82c2dcac..1df90b03 100644 --- a/tests/test-sources/examples.nix +++ b/tests/test-sources/examples.nix @@ -1,4 +1,4 @@ -{pkgs}: { +{pkgs, ...}: { plain = {}; simple-plugin = { diff --git a/tests/test-sources/modules/clipboard.nix b/tests/test-sources/modules/clipboard.nix index e88a837e..044b7461 100644 --- a/tests/test-sources/modules/clipboard.nix +++ b/tests/test-sources/modules/clipboard.nix @@ -1,4 +1,4 @@ -{pkgs}: { +{ example-with-str = { clipboard = { register = "unnamed"; diff --git a/tests/test-sources/plugins/languages/nvim-jdtls.nix b/tests/test-sources/plugins/languages/nvim-jdtls.nix index be50f13a..8933095e 100644 --- a/tests/test-sources/plugins/languages/nvim-jdtls.nix +++ b/tests/test-sources/plugins/languages/nvim-jdtls.nix @@ -1,4 +1,4 @@ -{pkgs}: { +{pkgs, ...}: { example = { plugins.nvim-jdtls = { enable = true; diff --git a/tests/test-sources/plugins/languages/treesitter/treesitter-context.nix b/tests/test-sources/plugins/languages/treesitter/treesitter-context.nix index c96bb7b5..a9971671 100644 --- a/tests/test-sources/plugins/languages/treesitter/treesitter-context.nix +++ b/tests/test-sources/plugins/languages/treesitter/treesitter-context.nix @@ -1,4 +1,4 @@ -{pkgs}: { +{ empty = { plugins = { treesitter.enable = true; diff --git a/tests/test-sources/plugins/languages/treesitter/treesitter.nix b/tests/test-sources/plugins/languages/treesitter/treesitter.nix index 7dfa1edd..e6071fc7 100644 --- a/tests/test-sources/plugins/languages/treesitter/treesitter.nix +++ b/tests/test-sources/plugins/languages/treesitter/treesitter.nix @@ -1,4 +1,4 @@ -{pkgs}: { +{ empty = { plugins.treesitter.enable = true; }; diff --git a/tests/test-sources/plugins/lsp/nvim-lsp.nix b/tests/test-sources/plugins/lsp/nvim-lsp.nix index 3a86a8e8..1c2e2b85 100644 --- a/tests/test-sources/plugins/lsp/nvim-lsp.nix +++ b/tests/test-sources/plugins/lsp/nvim-lsp.nix @@ -1,4 +1,4 @@ -{pkgs}: { +{pkgs, ...}: { empty = { plugins.lsp.enable = true; }; diff --git a/tests/test-sources/plugins/statuslines/lualine.nix b/tests/test-sources/plugins/statuslines/lualine.nix index 6dca04d9..f1e5d4d6 100644 --- a/tests/test-sources/plugins/statuslines/lualine.nix +++ b/tests/test-sources/plugins/statuslines/lualine.nix @@ -1,4 +1,4 @@ -{pkgs}: { +{pkgs, ...}: { empty = { plugins.lualine.enable = true; }; diff --git a/tests/test-sources/plugins/utils/alpha.nix b/tests/test-sources/plugins/utils/alpha.nix index 0bb49ce5..1fe3060c 100644 --- a/tests/test-sources/plugins/utils/alpha.nix +++ b/tests/test-sources/plugins/utils/alpha.nix @@ -1,4 +1,4 @@ -{pkgs}: { +{ empty = { plugins.alpha.enable = true; };