khal: fix trailing slash bug for singlefile calendars

Fix the trailing slash bug described in issue #8024 by conditionally adding a slash only for filesystem type, not for singlefile. Also update the expected test output to match the correct order.

modules/programs/khal/default.nix

@@ -58,7 +58,7 @@ let
         "[[${name}]]"
         "path = ${
           value.local.path
-          + "/" # TODO: dont add slash if type is "singlefile"
+          + (if value.local.type == "singlefile" then "" else "/")
           + (optionalString (value.khal.type == "discover") value.khal.glob)
           + (optionalString (
             value.khal.type == "birthdays" && value.khal ? thisCollection

tests/modules/programs/khal/khal-config-expected

@@ -8,6 +8,15 @@ type=calendar
 
 
 
+[[testSinglefile]]
+path = $XDG_CONFIG_HOME/cal/timetable.ics
+readonly = True
+addresses= study@university.edu
+priority=10
+type=calendar
+
+
+
 [[testWithAddresss]]
 path = /home/hm-user/$XDG_CONFIG_HOME/cal/testWithAddresss/
 addresses= john.doe@email.com
@@ -23,13 +32,6 @@ priority=10
 type=calendar
 
 
-[[testSinglefile]]
-path = $XDG_CONFIG_HOME/cal/timetable.ics
-readonly = True
-addresses= study@university.edu
-priority=10
-type=calendar
-
 
 [[testcontacts-automaticallyCollected]]
 path = /home/hm-user/$XDG_CONFIG_HOME/card/testcontacts/automaticallyCollected