kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-12-12 09:52:37 +00:00
Code Issues Projects Releases Wiki Activity

[cosmetic] Weather module humidity positioning (#3330)

Browse Source 
This PR adds an option to tweak the layout of the weather module. When
set, the humidity appears alongside the temperature:

![Screenshot from 2024-01-03
11-56-55](https://github.com/MagicMirrorOrg/MagicMirror/assets/551990/2a9fdf9a-21e4-49f5-8a48-68ea21902592)
This commit is contained in:
Ross Younger
2024-01-29 19:45:49 +13:00
committed by GitHub
parent 431bf22adb
commit 57de389e01
7 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/configs/modules/weather/currentweather_default.js
View File

@@ -7,6 +7,7 @@ let config = {
position: "bottom_bar",
config: {
location: "Munich",
showHumidity: "feelslike",
mockData: '"#####WEATHERDATA#####"'
}
}

2
tests/configs/modules/weather/currentweather_options.js
View File

@@ -9,7 +9,7 @@ let config = {
windUnits: "beaufort",
showWindDirectionAsArrow: true,
showSun: false,
showHumidity: true,
showHumidity: "wind",
roundTemp: true,
degreeLabel: true
}

2
tests/configs/modules/weather/currentweather_units.js
View File

@@ -9,7 +9,7 @@ let config = {
location: "Munich",
mockData: '"#####WEATHERDATA#####"',
decimalSymbol: ",",
showHumidity: true
showHumidity: "wind"
}
}
]

10
tests/e2e/modules/weather_current_spec.js
View File

@@ -23,7 +23,11 @@ describe("Weather module", () => {
});
it("should render feels like temperature", async () => {
await expect(weatherFunc.getText(".weather .normal.medium.feelslike span.dimmed", "Feels like -5.6°")).resolves.toBe(true);
// Template contains   which renders as \xa0
await expect(weatherFunc.getText(".weather .normal.medium.feelslike span.dimmed", "93.7\xa0 Feels like -5.6°")).resolves.toBe(true);
});
it("should render humidity next to feels-like", async () => {
await expect(weatherFunc.getText(".weather .normal.medium.feelslike span.dimmed .humidity", "93.7")).resolves.toBe(true);
});
});
});
@@ -53,8 +57,8 @@ describe("Weather module", () => {
expect(elem.outerHTML).toContain("transform:rotate(250deg)");
});
it("should render humidity", async () => {
await expect(weatherFunc.getText(".weather .normal.medium span:nth-child(3)", "93.7")).resolves.toBe(true);
it("should render humidity next to wind", async () => {
await expect(weatherFunc.getText(".weather .normal.medium .humidity", "93.7")).resolves.toBe(true);
});
it("should render degreeLabel for temp", async () => {