Zander671/Waybar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into pr-4320

Browse Source 
# Conflicts:
#	include/modules/hyprland/workspaces.hpp
#	man/waybar-hyprland-workspaces.5.scd
#	src/modules/hyprland/workspace.cpp
#	src/modules/hyprland/workspaces.cpp
This commit is contained in:
Alex
2026-07-04 00:51:21 +02:00
parent af1ccf7d86 e9494bd271
commit 05f32172df
302 changed files with 14350 additions and 5052 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/config.cpp
+27
View File
@@ -84,6 +84,33 @@ TEST_CASE("Load simple config with include", "[config]") {
}
}
TEST_CASE("Load simple config with wildcard include", "[config]") {
waybar::Config conf;
conf.load("test/config/include-wildcard.json");
auto& data = conf.getConfig();
SECTION("validate cpu include file") { REQUIRE(data["cpu"]["format"].asString() == "goo"); }
SECTION("validate memory include file") { REQUIRE(data["memory"]["format"].asString() == "foo"); }
}
TEST_CASE("Load config using relative paths and wildcards", "[config]") {
waybar::Config conf;
const char* old_config_path = std::getenv(waybar::Config::CONFIG_PATH_ENV);
setenv(waybar::Config::CONFIG_PATH_ENV, "test/config", 1);
conf.load("test/config/include-relative-path.json");
auto& data = conf.getConfig();
SECTION("validate cpu include file") { REQUIRE(data["cpu"]["format"].asString() == "goo"); }
SECTION("validate memory include file") { REQUIRE(data["memory"]["format"].asString() == "foo"); }
if (old_config_path)
setenv(waybar::Config::CONFIG_PATH_ENV, old_config_path, 1);
else
unsetenv(waybar::Config::CONFIG_PATH_ENV);
}
TEST_CASE("Load multiple bar config with include", "[config]") {
waybar::Config conf;
conf.load("test/config/include-multi.json");