tests/cmp: various fixes

Author: MattSturgeon

tests/test-sources/plugins/by-name/cmp-ai/default.nix

@@ -3,9 +3,9 @@
     # We do not provide the required HF_API_KEY environment variable.
     test.runNvim = false;
 
-    plugins.cmp = {
-      enable = true;
-      settings.sources = [ { name = "cmp_ai"; } ];
+    plugins = {
+      cmp.enable = true;
+      cmp-ai.enable = true;
     };
   };
 
@@ -14,10 +14,8 @@
     test.runNvim = false;
 
     plugins = {
-      cmp = {
-        enable = true;
-        settings.sources = [ { name = "cmp_ai"; } ];
-      };
+      cmp.enable = true;
+      cmp-ai.enable = true;
       cmp-ai.settings = {
         max_lines = 1000;
         provider = "HF";

tests/test-sources/plugins/by-name/cmp-git/default.nix

@@ -1,11 +1,9 @@
 {
   defaults = {
     plugins = {
-      cmp = {
-        enable = true;
-        settings.sources = [ { name = "git"; } ];
-      };
+      cmp.enable = true;
 
+      cmp-git.enable = true;
       cmp-git.settings = {
         filetypes = [
           "gitcommit"
@@ -140,11 +138,9 @@
 
   example = {
     plugins = {
-      cmp = {
-        enable = true;
-        settings.sources = [ { name = "git"; } ];
-      };
+      cmp.enable = true;
 
+      cmp-git.enable = true;
       cmp-git.settings = {
         remotes = [
           "upstream"

tests/test-sources/plugins/by-name/cmp-tabby/default.nix

@@ -1,17 +1,15 @@
 {
   empty = {
-    plugins.cmp = {
-      enable = true;
-      settings.sources = [ { name = "cmp_tabby"; } ];
-    };
+    plugins.cmp.enable = true;
+    plugins.cmp-tabby.enable = true;
   };
 
   defaults = {
     plugins = {
       cmp = {
         enable = true;
-        settings.sources = [ { name = "cmp_tabby"; } ];
       };
+      cmp-tabby.enable = true;
       cmp-tabby.settings = {
         host = "http://localhost:5000";
         max_lines = 100;

tests/test-sources/plugins/by-name/codeium-nvim/default.nix

@@ -2,15 +2,18 @@
   empty = {
     plugins.codeium-nvim = {
       enable = true;
+      cmp.enable = false;
       settings.enable_cmp_source = false;
     };
   };
 
   enabled-by-cmp = {
-    plugins.cmp = {
-      enable = true;
-
-      settings.sources = [ { name = "codeium"; } ];
+    plugins = {
+      cmp.enable = true;
+      codeium-nvim = {
+        enable = true;
+        settings.enable_cmp_source = false;
+      };
     };
   };
 

tests/test-sources/plugins/by-name/copilot-cmp/default.nix

@@ -1,11 +1,15 @@
 {
   empty = {
-    plugins.copilot-cmp.enable = true;
+    plugins.copilot-cmp = {
+      enable = true;
+      cmp.enable = false;
+    };
   };
 
   defaults = {
-    plugins.copilot-cmp = {
-      enable = true;
+    plugins = {
+      cmp.enable = true;
+      copilot-cmp.enable = true;
     };
   };
 }

tests/test-sources/plugins/by-name/crates/default.nix

@@ -1,6 +1,8 @@
 {
   empty = {
     plugins.crates.enable = true;
+    # Explicit disable to suppress warnings
+    plugins.cmp.enable = false;
   };
 
   defaults = {
@@ -202,6 +204,8 @@
         };
       };
     };
+    # Explicit disable to suppress warnings
+    plugins.cmp.enable = false;
   };
 
   example = {
@@ -214,5 +218,7 @@
         autoupdate = true;
       };
     };
+    # Explicit disable to suppress warnings
+    plugins.cmp.enable = false;
   };
 }

tests/test-sources/plugins/by-name/papis/default.nix

@@ -1,9 +1,11 @@
 {
   empty = {
     plugins.papis.enable = true;
+    plugins.papis.cmp.enable = false;
   };
 
   defaults = {
+    plugins.cmp.enable = true;
     plugins.papis = {
       enable = true;
 
@@ -328,6 +330,7 @@
   };
 
   example = {
+    plugins.cmp.enable = true;
     plugins.papis = {
       enable = true;
 

tests/test-sources/plugins/by-name/vim-dadbod-completion/default.nix

@@ -1,5 +1,11 @@
 {
   empty = {
     plugins.vim-dadbod-completion.enable = true;
+    plugins.vim-dadbod-completion.cmp.enable = false;
+  };
+
+  with-cmp = {
+    plugins.cmp.enable = true;
+    plugins.vim-dadbod-completion.enable = true;
   };
 }