From 9bc685e5a888e76b7614e4e388c07fcc085e868d Mon Sep 17 00:00:00 2001
From: "Matthieu C." <886074+teto@users.noreply.github.com>
Date: Mon, 24 Mar 2025 03:32:20 +0100
Subject: [PATCH] fixed gpgp

---
 .../modules/programs/neomutt/hm-example.com-gpg-expected.conf | 4 ----
 .../programs/neomutt/neomutt-with-binds-with-warning.nix      | 4 ++--
 tests/modules/programs/neomutt/neomutt-with-gpg.nix           | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/modules/programs/neomutt/hm-example.com-gpg-expected.conf b/tests/modules/programs/neomutt/hm-example.com-gpg-expected.conf
index f37710719..4c8d65e16 100644
--- a/tests/modules/programs/neomutt/hm-example.com-gpg-expected.conf
+++ b/tests/modules/programs/neomutt/hm-example.com-gpg-expected.conf
@@ -13,10 +13,6 @@ set sort = "threads"
 set smtp_pass="`password-command`"
 set smtp_url='smtps://home.manager@smtp.example.com'
 
-
-
-
-
 # MRA section
 set folder='/home/hm-user/Mail/hm@example.com'
 set from='hm@example.com'
diff --git a/tests/modules/programs/neomutt/neomutt-with-binds-with-warning.nix b/tests/modules/programs/neomutt/neomutt-with-binds-with-warning.nix
index f9d144dfd..bb0a0f89b 100644
--- a/tests/modules/programs/neomutt/neomutt-with-binds-with-warning.nix
+++ b/tests/modules/programs/neomutt/neomutt-with-binds-with-warning.nix
@@ -52,10 +52,10 @@
   nmt.script = ''
     assertFileExists home-files/.config/neomutt/neomuttrc
     assertFileExists home-files/.config/neomutt/hm@example.com
-    assertFileContent home-files/.config/neomutt/neomuttrc ${
+    assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${
       ./neomutt-with-binds-expected.conf
     }
-    assertFileContent home-files/.config/neomutt/hm@example.com ${
+    assertFileContent $(normalizeStorePaths home-files/.config/neomutt/hm@example.com) ${
       ./hm-example.com-expected
     }
   '';
diff --git a/tests/modules/programs/neomutt/neomutt-with-gpg.nix b/tests/modules/programs/neomutt/neomutt-with-gpg.nix
index 1f542d747..9b43fc703 100644
--- a/tests/modules/programs/neomutt/neomutt-with-gpg.nix
+++ b/tests/modules/programs/neomutt/neomutt-with-gpg.nix
@@ -17,7 +17,7 @@
   nmt.script = ''
     assertFileExists home-files/.config/neomutt/neomuttrc
     assertFileExists home-files/.config/neomutt/hm@example.com
-    assertFileContent home-files/.config/neomutt/neomuttrc ${
+    assertFileContent $(normalizeStorePaths home-files/.config/neomutt/neomuttrc) ${
       ./neomutt-expected.conf
     }
     assertFileContent home-files/.config/neomutt/hm@example.com ${