neovim.tests: added more tests

to check for creation of vi/vim aliases.
These tests also now follow the coding conventions of having tests in
passthru.test .

pkgs/applications/editors/neovim/tests.nix

@@ -0,0 +1,135 @@
+{ vimUtils, vim_configurable, writeText, neovim, vimPlugins
+, lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable
+, neovim-unwrapped
+, fetchFromGitLab
+, pkgs
+}:
+let
+  inherit (vimUtils) buildVimPluginFrom2Nix;
+  inherit (neovimUtils) makeNeovimConfig;
+
+  packages.myVimPackage.start = with vimPlugins; [ vim-nix ];
+
+  plugins = with vimPlugins; [
+    {
+      plugin = vim-obsession;
+      config = ''
+        map <Leader>$ <Cmd>Obsession<CR>
+      '';
+    }
+  ];
+
+  nvimConfNix = makeNeovimConfig {
+    inherit plugins;
+    customRC = ''
+      " just a comment
+    '';
+  };
+
+  nvimAutoDisableWrap = makeNeovimConfig { };
+
+  nvimConfDontWrap = makeNeovimConfig {
+    inherit plugins;
+    customRC = ''
+      " just a comment
+    '';
+  };
+
+  wrapNeovim2 = suffix: config:
+    wrapNeovimUnstable neovim-unwrapped (config // {
+      extraName = suffix;
+    });
+
+  nmt = fetchFromGitLab {
+    owner = "rycee";
+    repo = "nmt";
+    rev = "d2cc8c1042b1c2511f68f40e2790a8c0e29eeb42";
+    sha256 = "1ykcvyx82nhdq167kbnpgwkgjib8ii7c92y3427v986n2s5lsskc";
+  };
+
+  runTest = neovim-drv: buildCommand:
+    pkgs.runCommandLocal "test-${neovim-drv.name}" ({
+      nativeBuildInputs = [ ];
+      meta.platforms = neovim-drv.meta.platforms;
+    }) (''
+      source ${nmt}/bash-lib/assertions.sh
+      vimrc="${writeText "init.vim" neovim-drv.initRc}"
+      vimrcGeneric="$out/patched.vim"
+      mkdir $out
+      ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$vimrc" > "$vimrcGeneric"
+    '' + buildCommand);
+
+in
+  pkgs.recurseIntoAttrs (
+rec {
+  vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; };
+
+  ### neovim tests
+  ##################
+  nvim_with_plugins = wrapNeovim2 "-with-plugins" nvimConfNix;
+
+  nvim_via_override = neovim.override {
+    extraName = "-via-override";
+    configure = {
+      packages.foo.start = [ vimPlugins.ale ];
+      customRC = ''
+        :help ale
+      '';
+    };
+  };
+
+  nvim_with_aliases = neovim.override {
+    extraName = "-with-aliases";
+    vimAlias = true;
+    viAlias = true;
+  };
+
+  # nixpkgs should detect that no wrapping is necessary
+  nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimAutoDisableWrap;
+
+  # this will generate a neovimRc content but we disable wrapping
+  nvimDontWrap = wrapNeovim2 "-forced-nowrap" (makeNeovimConfig {
+    wrapRc = false;
+    customRC = ''
+      " this shouldn't trigger the creation of an init.vim
+    '';
+  });
+
+  force-nowrap = runTest nvimDontWrap ''
+      ! grep "-u" ${nvimDontWrap}/bin/nvim
+  '';
+
+  nvim_via_override-test = runTest nvim_via_override ''
+      assertFileContent \
+        "$vimrcGeneric" \
+        "${./neovim-override.vim}"
+  '';
+
+
+  checkAliases = runTest nvim_with_aliases ''
+      folder=${nvim_with_aliases}/bin
+      assertFileExists "$folder/vi"
+      assertFileExists "$folder/vim"
+  '';
+
+  # having no RC generated should autodisable init.vim wrapping
+  nvim_autowrap = runTest nvim_via_override ''
+      ! grep "-u" ${nvimShouldntWrap}/bin/nvim
+  '';
+
+
+  # system remote plugin manifest should be generated, deoplete should be usable
+  # without the user having to do `UpdateRemotePlugins`. To test, launch neovim
+  # and do `:call deoplete#enable()`. It will print an error if the remote
+  # plugin is not registered.
+  test_nvim_with_remote_plugin = neovim.override {
+    extraName = "-pathogen-remote";
+    configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ];
+  };
+
+  # only neovim makes use of `requiredPlugins`, test this here
+  test_nvim_with_vim_nix_using_pathogen = neovim.override {
+    extraName = "-pathogen";
+    configure.pathogen.pluginNames = [ "vim-nix" ];
+  };
+})

pkgs/applications/editors/neovim/wrapper.nix

@@ -4,6 +4,7 @@
 , nodejs
 , nodePackages
 , python3Packages
+, callPackage
 }:
 with lib;
 
@@ -120,6 +121,9 @@ let
     passthru = {
       unwrapped = neovim;
       initRc = neovimRcContent;
+
+      tests = callPackage ./tests.nix {
+      };
     };
 
     meta = neovim.meta // {

pkgs/test/vim/default.nix

@@ -1,104 +1,16 @@
-{ vimUtils, vim_configurable, writeText, neovim, vimPlugins
-, lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable
-, neovim-unwrapped
-, fetchFromGitLab
+{ vimUtils, vim_configurable, writeText, vimPlugins
+, lib, fetchFromGitHub
 , pkgs
 }:
 let
   inherit (vimUtils) buildVimPluginFrom2Nix;
-  inherit (neovimUtils) makeNeovimConfig;
 
   packages.myVimPackage.start = with vimPlugins; [ vim-nix ];
 
-  plugins = with vimPlugins; [
-    {
-      plugin = vim-obsession;
-      config = ''
-        map <Leader>$ <Cmd>Obsession<CR>
-      '';
-    }
-  ];
-
-  nvimConfNix = makeNeovimConfig {
-    inherit plugins;
-    customRC = ''
-      " just a comment
-    '';
-  };
-
-  nvimConfDontWrap = makeNeovimConfig {
-    inherit plugins;
-    customRC = ''
-      " just a comment
-    '';
-  };
-
-  wrapNeovim2 = suffix: config:
-    wrapNeovimUnstable neovim-unwrapped (config // {
-      extraName = suffix;
-    });
-
-  nmt = fetchFromGitLab {
-    owner = "rycee";
-    repo = "nmt";
-    rev = "d2cc8c1042b1c2511f68f40e2790a8c0e29eeb42";
-    sha256 = "1ykcvyx82nhdq167kbnpgwkgjib8ii7c92y3427v986n2s5lsskc";
-  };
-
-  runTest = neovim-drv: buildCommand:
-    pkgs.runCommandLocal "test-${neovim-drv.name}" ({
-      nativeBuildInputs = [ ];
-      meta.platforms = neovim-drv.meta.platforms;
-    }) (''
-      source ${nmt}/bash-lib/assertions.sh
-      vimrc="${writeText "init.vim" neovim-drv.initRc}"
-      vimrcGeneric="$out/patched.vim"
-      mkdir $out
-      ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$vimrc" > "$vimrcGeneric"
-    '' + buildCommand);
-
 in
-  pkgs.recurseIntoAttrs (
-rec {
+  pkgs.recurseIntoAttrs (rec {
   vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; };
 
-  ### neovim tests
-  ##################
-  nvim_with_plugins = wrapNeovim2 "-with-plugins" nvimConfNix;
-
-  nvim_via_override = neovim.override {
-    extraName = "-via-override";
-    configure = {
-      packages.foo.start = [ vimPlugins.ale ];
-      customRC = ''
-        :help ale
-      '';
-    };
-  };
-
-
-  # nixpkgs should detect that no wrapping is necessary
-  nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimConfNix;
-
-
-  # this will generate a neovimRc content but we disable wrapping
-  nvimDontWrap = wrapNeovim2 "-dont-wrap" (makeNeovimConfig {
-    wrapRc = false;
-    customRC = ''
-      " this shouldn't trigger the creation of an init.vim
-    '';
-  });
-
-  nvim_dontwrap-test = runTest nvimDontWrap ''
-      ! grep "-u" ${nvimDontWrap}/bin/nvim
-  '';
-
-  nvim_via_override-test = runTest nvim_via_override ''
-      assertFileContent \
-        "$vimrcGeneric" \
-        "${./neovim-override.vim}"
-  '';
-
   ### vim tests
   ##################
   vim_with_vim2nix = vim_configurable.customize {
@@ -126,11 +38,6 @@ rec {
     vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-nix ];
   };
 
-  # only neovim makes use of `requiredPlugins`, test this here
-  test_nvim_with_vim_nix_using_pathogen = neovim.override {
-    configure.pathogen.pluginNames = [ "vim-nix" ];
-  };
-
   # regression test for https://github.com/NixOS/nixpkgs/issues/53112
   # The user may have specified their own plugins which may not be formatted
   # exactly as the generated ones. In particular, they may not have the `pname`
@@ -153,12 +60,4 @@ rec {
       });
     vimrcConfig.vam.pluginDictionaries = [ { names = [ "vim-trailing-whitespace" ]; } ];
   };
-
-  # system remote plugin manifest should be generated, deoplete should be usable
-  # without the user having to do `UpdateRemotePlugins`. To test, launch neovim
-  # and do `:call deoplete#enable()`. It will print an error if the remote
-  # plugin is not registered.
-  test_nvim_with_remote_plugin = neovim.override {
-    configure.pathogen.pluginNames = with vimPlugins; [ deoplete-nvim ];
-  };
 })