nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

tests: change quoting to match new Nixpkgs behavior

Browse source 
Fixes tests that are affected by
<https://github.com/NixOS/nixpkgs/pull/333744>.
This commit is contained in:
Robert Helgesson 2024-09-08 09:55:05 +02:00
parent ec4c6928bb
commit 8a175a8913
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
39 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/modules/programs/atuin/set-flags.nix
View file

@ -25,12 +25,12 @@
assertFileExists home-files/.bashrc
assertFileContains \
home-files/.bashrc \
"eval \"\$(@atuin@/bin/atuin init bash '--disable-ctrl-r' '--disable-up-arrow')\""
"eval \"\$(@atuin@/bin/atuin init bash --disable-ctrl-r --disable-up-arrow)\""
assertFileExists home-files/.zshrc
assertFileContains \
home-files/.zshrc \
"eval \"\$(@atuin@/bin/atuin init zsh '--disable-ctrl-r' '--disable-up-arrow')\""
"eval \"\$(@atuin@/bin/atuin init zsh --disable-ctrl-r --disable-up-arrow)\""
assertFileExists home-files/.config/fish/config.fish
assertFileContains \
home-files/.config/fish/config.fish \

2
tests/modules/programs/bat/bat.nix
View file

@ -35,7 +35,7 @@ with lib;
--map-syntax='*.jenkinsfile:Groovy'
--map-syntax='*.props:Java Properties'
--pager='less -FR'
--theme='TwoDark'
--theme=TwoDark
--show-all
''
}

2
tests/modules/programs/bat/deprecated-options.nix
View file

@ -45,7 +45,7 @@ with lib;
--map-syntax='*.jenkinsfile:Groovy'
--map-syntax='*.props:Java Properties'
--pager='less -FR'
--theme='TwoDark'
--theme=TwoDark
''
}

2
tests/modules/programs/bemenu/basic-configuration.nix
View file

@ -24,6 +24,6 @@
nmt.script = ''
assertFileExists home-path/etc/profile.d/hm-session-vars.sh
assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
"export BEMENU_OPTS=\"'--ab' '#1e1e2e' '--af' '#cdd6f4' '--fb' '#1e1e2e' '--ff' '#cdd6f4' '--hb' '#1e1e2e' '--hf' '#f9e2af' '--ignorecase' '--line-height' '28' '--nb' '#1e1e2e' '--nf' '#cdd6f4' '--prompt' 'open' '--tb' '#1e1e2e' '--tf' '#f38ba8' '--width-factor' '0.300000'\""
"export BEMENU_OPTS=\"--ab '#1e1e2e' --af '#cdd6f4' --fb '#1e1e2e' --ff '#cdd6f4' --hb '#1e1e2e' --hf '#f9e2af' --ignorecase --line-height 28 --nb '#1e1e2e' --nf '#cdd6f4' --prompt open --tb '#1e1e2e' --tf '#f38ba8' --width-factor 0.300000\""
'';
}

2
tests/modules/programs/gpg/immutable-keyfiles.nix
View file

@ -27,7 +27,7 @@
};
nmt.script = ''
assertFileNotRegex activate "^export GNUPGHOME='/home/hm-user/.gnupg'$"
assertFileNotRegex activate "^export GNUPGHOME=/home/hm-user/.gnupg$"
assertFileRegex activate \
'^install -m 0700 /nix/store/[0-9a-z]*-gpg-pubring/trustdb.gpg "/home/hm-user/.gnupg/trustdb.gpg"$'

2
tests/modules/programs/gpg/mutable-keyfiles.nix
View file

@ -17,7 +17,7 @@
test.stubs.systemd = { }; # depends on gnupg.override
nmt.script = ''
assertFileContains activate "export GNUPGHOME='/home/hm-user/.gnupg'"
assertFileContains activate "export GNUPGHOME=/home/hm-user/.gnupg"
assertFileContains activate "unset GNUPGHOME QUIET_ARG keyId importTrust"

2
tests/modules/programs/mujmap/mujmap-defaults-expected.toml
View file

@ -1,6 +1,6 @@
auto_create_new_mailboxes = true
fqdn = "example.com"
password_command = "'password-command'"
password_command = "password-command"
username = "home.manager"
[tags]

2
tests/modules/programs/pls/bash.nix
View file

@ -20,7 +20,7 @@ with lib;
assertFileExists home-files/.bashrc
assertFileContains \
home-files/.bashrc \
"alias ls='@pls@/bin/pls'"
"alias ls=@pls@/bin/pls"
assertFileContains \
home-files/.bashrc \
"alias ll='@pls@/bin/pls -d perms -d user -d group -d size -d mtime -d git'"

2
tests/modules/programs/pls/fish.nix
View file

@ -24,7 +24,7 @@ with lib;
assertFileExists home-files/.config/fish/config.fish
assertFileContains \
home-files/.config/fish/config.fish \
"alias ls '@pls@/bin/pls'"
"alias ls @pls@/bin/pls"
assertFileContains \
home-files/.config/fish/config.fish \
"alias ll '@pls@/bin/pls -d perms -d user -d group -d size -d mtime -d git'"

4
tests/modules/programs/pls/zsh.nix
View file

@ -23,10 +23,10 @@ with lib;
assertFileExists home-files/.zshrc
assertFileContains \
home-files/.zshrc \
"alias -- 'ls'='@pls@/bin/pls'"
"alias -- ls=@pls@/bin/pls"
assertFileContains \
home-files/.zshrc \
"alias -- 'll'='@pls@/bin/pls -d perms -d user -d group -d size -d mtime -d git'"
"alias -- ll='@pls@/bin/pls -d perms -d user -d group -d size -d mtime -d git'"
'';
};
}

4
tests/modules/programs/thefuck/integration-enabled-instant.nix
View file

@ -16,11 +16,11 @@
assertFileExists home-files/.bashrc
assertFileContains \
home-files/.bashrc \
'eval "$(@thefuck@/bin/thefuck '"'"'--alias'"'"' '"'"'--enable-experimental-instant-mode'"'"')"'
'eval "$(@thefuck@/bin/thefuck --alias --enable-experimental-instant-mode)"'
assertFileExists home-files/.zshrc
assertFileContains \
home-files/.zshrc \
'eval "$(@thefuck@/bin/thefuck '"'"'--alias'"'"' '"'"'--enable-experimental-instant-mode'"'"')"'
'eval "$(@thefuck@/bin/thefuck --alias --enable-experimental-instant-mode)"'
'';
}

4
tests/modules/programs/thefuck/integration-enabled.nix
View file

@ -15,7 +15,7 @@
assertFileExists home-files/.bashrc
assertFileContains \
home-files/.bashrc \
'eval "$(@thefuck@/bin/thefuck '"'"'--alias'"'"')"'
'eval "$(@thefuck@/bin/thefuck --alias)"'
assertFileExists home-files/.config/fish/functions/fuck.fish
assertFileContains \
@ -33,7 +33,7 @@
assertFileExists home-files/.zshrc
assertFileContains \
home-files/.zshrc \
'eval "$(@thefuck@/bin/thefuck '"'"'--alias'"'"')"'
'eval "$(@thefuck@/bin/thefuck --alias)"'
assertFileExists home-files/.config/nushell/config.nu
assertFileContains \

4
tests/modules/programs/zsh/syntax-highlighting.nix
View file

@ -19,8 +19,8 @@ with lib;
nmt.script = ''
assertFileContains home-files/.zshrc "source ${pkgs.hello}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
assertFileContains home-files/.zshrc "ZSH_HIGHLIGHT_HIGHLIGHTERS+=('brackets' 'pattern' 'cursor')"
assertFileContains home-files/.zshrc "ZSH_HIGHLIGHT_STYLES+=('comment' 'fg=#6c6c6c')"
assertFileContains home-files/.zshrc "ZSH_HIGHLIGHT_HIGHLIGHTERS+=(brackets pattern cursor)"
assertFileContains home-files/.zshrc "ZSH_HIGHLIGHT_STYLES+=(comment 'fg=#6c6c6c')"
'';
};
}

2
tests/modules/programs/zsh/zsh-abbr.nix
View file

@ -12,6 +12,6 @@
abbreviations=home-files/.config/zsh-abbr/user-abbreviations
assertFileExists $abbreviations
assertFileContains $abbreviations "abbr 'ga'='git add'"
assertFileContains $abbreviations "abbr ga='git add'"
'';
}