From 4d52400bc62c64d93d4fbcfab093d16ddda3f677 Mon Sep 17 00:00:00 2001 From: diniamo Date: Wed, 7 Aug 2024 16:51:28 +0200 Subject: [PATCH] fish: update plugins test --- tests/modules/programs/fish/plugins.nix | 50 ++++--------------------- 1 file changed, 8 insertions(+), 42 deletions(-) diff --git a/tests/modules/programs/fish/plugins.nix b/tests/modules/programs/fish/plugins.nix index 88684b3b4..f586df91e 100644 --- a/tests/modules/programs/fish/plugins.nix +++ b/tests/modules/programs/fish/plugins.nix @@ -1,49 +1,16 @@ -{ config, lib, pkgs, ... }: - -with lib; +{ lib, pkgs, ... }: let - - fooPluginSrc = pkgs.writeText "fooPluginSrc" ""; - - generatedConfdFile = pkgs.writeText "plugin-foo.fish" '' - # Plugin foo - set -l plugin_dir ${fooPluginSrc} - - # Set paths to import plugin components - if test -d $plugin_dir/functions - set fish_function_path $fish_function_path[1] $plugin_dir/functions $fish_function_path[2..-1] - end - - if test -d $plugin_dir/completions - set fish_complete_path $fish_complete_path[1] $plugin_dir/completions $fish_complete_path[2..-1] - end - - # Source initialization code if it exists. - if test -d $plugin_dir/conf.d - for f in $plugin_dir/conf.d/*.fish - source $f - end - end - - if test -f $plugin_dir/key_bindings.fish - source $plugin_dir/key_bindings.fish - end - - if test -f $plugin_dir/init.fish - source $plugin_dir/init.fish - end + testPlugin = pkgs.runCommandLocal "fish-test-plugin" { } '' + mkdir -p $out/{functions,completions,conf.d} + touch $out/{functions/test.fish,completions/test.fish,conf.d/test.fish} ''; - in { config = { programs.fish = { enable = true; - plugins = [{ - name = "foo"; - src = fooPluginSrc; - }]; + plugins = [ testPlugin ]; }; # Needed to avoid error with dummy fish package. @@ -54,11 +21,10 @@ in { description = "if fish.plugins set, check conf.d file exists and contents match"; script = '' - assertDirectoryExists home-files/.config/fish/conf.d - assertFileExists home-files/.config/fish/conf.d/plugin-foo.fish - assertFileContent home-files/.config/fish/conf.d/plugin-foo.fish ${generatedConfdFile} + assertFileExists home-files/.config/fish/functions/test.fish + assertFileExists home-files/.config/fish/completions/test.fish + assertFileExists home-files/.config/fish/conf.d/test.fish ''; - }; }; }