From 29280978234b73423f4eb708cbb999295f76b42a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 25 Feb 2023 01:27:04 +0100
Subject: [PATCH] Fix 22.11 tests (#3678)

* broot: update test to match upstream changes

Fixes #3527

(cherry picked from commit 18b56e3f7d5265ccf023b0bce0540a237988423c)

* broot: simplify test slightly

(cherry picked from commit d7a3c268542eadfc480c0dd362cd7d4b6eb2a536)

* i3status-rust: fix tests

Nix 2.12.0 slightly changed the JSON output format. This updates the
i3status-rust test cases to match.

(cherry picked from commit 263f6e4523168c770e21eee02def21d493c0f4b6)
---
 tests/modules/programs/broot/broot.nix        | 44 +++++++++----------
 .../programs/i3status-rust/with-custom.nix    |  4 +-
 .../programs/i3status-rust/with-default.nix   |  4 +-
 .../i3status-rust/with-extra-settings.nix     |  4 +-
 .../i3status-rust/with-multiple-bars.nix      |  4 +-
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/tests/modules/programs/broot/broot.nix b/tests/modules/programs/broot/broot.nix
index 440691cf..b39929e3 100644
--- a/tests/modules/programs/broot/broot.nix
+++ b/tests/modules/programs/broot/broot.nix
@@ -1,26 +1,26 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
+{ ... }:
 
 {
-  config = {
-    programs.broot = {
-      enable = true;
-      settings.modal = true;
-    };
-
-    nmt.script = ''
-      assertFileExists home-files/.config/broot/conf.toml
-      assertFileContent home-files/.config/broot/conf.toml ${
-        pkgs.writeText "broot.expected" ''
-          imports = ["verbs.hjson", {file = "dark-blue-skin.hjson", luma = ["dark", "unknown"]}, {file = "white-skin.hjson", luma = "light"}]
-          modal = true
-          show_selection_mark = true
-          verbs = []
-
-          [skin]
-        ''
-      }
-    '';
+  programs.broot = {
+    enable = true;
+    settings.modal = true;
   };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/broot/conf.toml
+    assertFileContent home-files/.config/broot/conf.toml ${
+      builtins.toFile "broot.expected" ''
+        content_search_max_file_size = "10MB"
+        imports = ["verbs.hjson", {file = "dark-blue-skin.hjson", luma = ["dark", "unknown"]}, {file = "white-skin.hjson", luma = "light"}]
+        modal = true
+        show_selection_mark = true
+        verbs = []
+
+        [skin]
+
+        [special_paths]
+        "/media" = "no-enter"
+      ''
+    }
+  '';
 }
diff --git a/tests/modules/programs/i3status-rust/with-custom.nix b/tests/modules/programs/i3status-rust/with-custom.nix
index d89e2ddc..c4131e02 100644
--- a/tests/modules/programs/i3status-rust/with-custom.nix
+++ b/tests/modules/programs/i3status-rust/with-custom.nix
@@ -102,14 +102,14 @@ with lib;
             icons = "awesome5"
             theme = "gruvbox-dark"
             [[block]]
-            alert = 10
+            alert = 10.0
             alias = "/"
             block = "disk_space"
             info_type = "available"
             interval = 60
             path = "/"
             unit = "GB"
-            warning = 20
+            warning = 20.0
 
             [[block]]
             block = "memory"
diff --git a/tests/modules/programs/i3status-rust/with-default.nix b/tests/modules/programs/i3status-rust/with-default.nix
index 3da74ac0..b5c20cee 100644
--- a/tests/modules/programs/i3status-rust/with-default.nix
+++ b/tests/modules/programs/i3status-rust/with-default.nix
@@ -16,14 +16,14 @@ with lib;
             icons = "none"
             theme = "plain"
             [[block]]
-            alert = 10
+            alert = 10.0
             alias = "/"
             block = "disk_space"
             info_type = "available"
             interval = 60
             path = "/"
             unit = "GB"
-            warning = 20
+            warning = 20.0
 
             [[block]]
             block = "memory"
diff --git a/tests/modules/programs/i3status-rust/with-extra-settings.nix b/tests/modules/programs/i3status-rust/with-extra-settings.nix
index 63458662..aad7618e 100644
--- a/tests/modules/programs/i3status-rust/with-extra-settings.nix
+++ b/tests/modules/programs/i3status-rust/with-extra-settings.nix
@@ -111,14 +111,14 @@ with lib;
           pkgs.writeText "i3status-rust-expected-config" ''
             icons = "awesome5"
             [[block]]
-            alert = 10
+            alert = 10.0
             alias = "/"
             block = "disk_space"
             info_type = "available"
             interval = 60
             path = "/"
             unit = "GB"
-            warning = 20
+            warning = 20.0
 
             [[block]]
             block = "memory"
diff --git a/tests/modules/programs/i3status-rust/with-multiple-bars.nix b/tests/modules/programs/i3status-rust/with-multiple-bars.nix
index eab7f42d..a8ffd373 100644
--- a/tests/modules/programs/i3status-rust/with-multiple-bars.nix
+++ b/tests/modules/programs/i3status-rust/with-multiple-bars.nix
@@ -62,14 +62,14 @@ with lib;
             icons = "none"
             theme = "plain"
             [[block]]
-            alert = 10
+            alert = 10.0
             alias = "/"
             block = "disk_space"
             info_type = "available"
             interval = 60
             path = "/"
             unit = "GB"
-            warning = 20
+            warning = 20.0
 
             [[block]]
             block = "memory"