diff options
| -rw-r--r-- | test/Xmobar/Plugins/Monitors/CpuSpec.hs | 2 | ||||
| -rw-r--r-- | xmobar.cabal | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/Xmobar/Plugins/Monitors/CpuSpec.hs b/test/Xmobar/Plugins/Monitors/CpuSpec.hs index 449acd5..3d07dee 100644 --- a/test/Xmobar/Plugins/Monitors/CpuSpec.hs +++ b/test/Xmobar/Plugins/Monitors/CpuSpec.hs @@ -23,7 +23,7 @@ spec = do let args = ["-L","3","-H","50","--normal","green","--high","red", "-t", "Cpu: <total>% <bar>"] cpuArgs <- getArguments args cpuValue <- runCpu cpuArgs - cpuValue `shouldSatisfy` (\item -> "::" `isSuffixOf` item) + cpuValue `shouldSatisfy` (all (`elem` ":#") . last . words) it "works with no icon pattern template" $ do let args = ["-L","3","-H","50","--normal","green","--high","red", "-t", "Cpu: <total>% <bar>", "--", "--load-icon-pattern", "<icon=bright_%%.xpm/>"] cpuArgs <- getArguments args diff --git a/xmobar.cabal b/xmobar.cabal index c03db46..1a9b41b 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -335,6 +335,7 @@ test-suite XmobarTest Xmobar.Plugins.Monitors.Common.Output Xmobar.Plugins.Monitors.Common.Files Xmobar.Plugins.Monitors.Cpu + Xmobar.Plugins.Monitors.CpuSpec Xmobar.Plugins.Monitors.Common.Run Xmobar.Run.Exec Xmobar.App.Timer @@ -347,7 +348,6 @@ test-suite XmobarTest other-modules: Xmobar.Plugins.Monitors.Volume Xmobar.Plugins.Monitors.Alsa Xmobar.Plugins.Monitors.AlsaSpec - Xmobar.Plugins.Monitors.CpuSpec cpp-options: -DALSA |