From 6c5025e2bb117eb16c0aa55097ce69935f72e14c Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Fri, 9 May 2025 23:18:50 +0200 Subject: [PATCH] tests/dircolors: add nushell integration tests --- tests/modules/programs/dircolors/settings.nix | 31 +++++++++++++------ .../dircolors/xdg-config-settings.nix | 29 ++++++++++++----- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/tests/modules/programs/dircolors/settings.nix b/tests/modules/programs/dircolors/settings.nix index 1404cfd71..2ac722c53 100644 --- a/tests/modules/programs/dircolors/settings.nix +++ b/tests/modules/programs/dircolors/settings.nix @@ -1,7 +1,8 @@ -{ pkgs, ... }: +{ config, pkgs, ... }: { config = { programs.zsh.enable = true; + programs.nushell.enable = true; programs.dircolors = { enable = true; @@ -17,15 +18,27 @@ ''; }; - nmt.script = '' - assertFileContent \ - home-files/.dir_colors \ - ${./settings-expected.conf} + nmt.script = + let + nushellConfigDir = + if pkgs.stdenv.isDarwin && !config.xdg.enable then + "home-files/Library/Application Support/nushell" + else + "home-files/.config/nushell"; + in + '' + assertFileContent \ + home-files/.dir_colors \ + ${./settings-expected.conf} - assertFileRegex \ - home-files/.zshrc \ - "eval \$(${pkgs.coreutils}/bin/dircolors -b ~/.dir_colors)" - ''; + assertFileRegex \ + home-files/.zshrc \ + "eval \$(${pkgs.coreutils}/bin/dircolors -b ~/.dir_colors)" + + assertFileExists "${nushellConfigDir}/env.nu" + assertFileRegex "${nushellConfigDir}/env.nu" \ + "source /nix/store/[^/]*-dircolors.nu" + ''; }; } diff --git a/tests/modules/programs/dircolors/xdg-config-settings.nix b/tests/modules/programs/dircolors/xdg-config-settings.nix index 75b5147bb..6fde1a878 100644 --- a/tests/modules/programs/dircolors/xdg-config-settings.nix +++ b/tests/modules/programs/dircolors/xdg-config-settings.nix @@ -4,6 +4,7 @@ home.preferXdgDirectories = true; programs.zsh.enable = true; + programs.nushell.enable = true; programs.dircolors = { enable = true; @@ -19,14 +20,26 @@ ''; }; - nmt.script = '' - assertFileContent \ - home-files/.config/dir_colors \ - ${./settings-expected.conf} + nmt.script = + let + nushellConfigDir = + if pkgs.stdenv.isDarwin && !config.xdg.enable then + "home-files/Library/Application Support/nushell" + else + "home-files/.config/nushell"; + in + '' + assertFileContent \ + home-files/.config/dir_colors \ + ${./settings-expected.conf} - assertFileRegex \ - home-files/.zshrc \ - "eval \$(${pkgs.coreutils}/bin/dircolors -b ${config.xdg.configHome}/dir_colors)" - ''; + assertFileRegex \ + home-files/.zshrc \ + "eval \$(${pkgs.coreutils}/bin/dircolors -b ${config.xdg.configHome}/dir_colors)" + + assertFileExists "${nushellConfigDir}/env.nu" + assertFileRegex "${nushellConfigDir}/env.nu" \ + "source /nix/store/[^/]*-dircolors.nu" + ''; }; }