From 3ed2f052a50731aea7bd2a538c3db898b5b15d7f Mon Sep 17 00:00:00 2001 From: jao Date: Sat, 27 Jun 2026 18:49:18 +0100 Subject: better fix for CPU template for testing --- test/Xmobar/Plugins/Monitors/CpuSpec.hs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'test/Xmobar') diff --git a/test/Xmobar/Plugins/Monitors/CpuSpec.hs b/test/Xmobar/Plugins/Monitors/CpuSpec.hs index d3155ef..1af0790 100644 --- a/test/Xmobar/Plugins/Monitors/CpuSpec.hs +++ b/test/Xmobar/Plugins/Monitors/CpuSpec.hs @@ -11,6 +11,15 @@ import Data.List main :: IO () main = hspec spec +remove :: String -> String -> String +remove w "" = "" +remove w s@(c:cs) + | w `isPrefixOf` s = remove w (drop (length w) s) + | otherwise = c : remove w cs + +remtags :: String -> String +remtags = remove "" . remove "" . remove "" + spec :: Spec spec = describe "CPU Spec" $ do @@ -21,9 +30,9 @@ spec = cpuValue `shouldSatisfy` (\item -> "Cpu:" `isPrefixOf` item) it "works with bar template" $ do let args = ["-L","3","-H","50","--normal","green","--high","red", "-t", "Cpu: % "] - cpuArgs <- getArguments $ map (filter ('#' /=)) args + cpuArgs <- getArguments args cpuValue <- runCpu cpuArgs - cpuValue `shouldSatisfy` (all (`elem` ":#") . last . words) + cpuValue `shouldSatisfy` (all (`elem` ":#") . remtags . last . words) it "works with no icon pattern template" $ do let args = ["-L","3","-H","50","--normal","green","--high","red", "-t", "Cpu: % ", "--", "--load-icon-pattern", ""] cpuArgs <- getArguments args -- cgit v1.2.3