Cleanups and more unit tests

modules/default/weather/providers/weathergov.js

@@ -171,7 +171,7 @@ WeatherProvider.register("weathergov", {
 		const days = [];
 
 		// variable for date
-		let weather = new WeatherObject(this.config.units, this.config.tempUnits, this.config.windUnits, this.config.useKmh);
+		let weather = new WeatherObject();
 		for (const forecast of forecasts) {
 			weather.date = moment(forecast.startTime.slice(0, 19));
 			if (forecast.windSpeed.search(" ") < 0) {
@@ -187,7 +187,7 @@ WeatherProvider.register("weathergov", {
 
 			days.push(weather);
 
-			weather = new WeatherObject(this.config.units, this.config.tempUnits, this.config.windUnits, this.config.useKmh);
+			weather = new WeatherObject();
 		}
 
 		// push weather information to days array

tests/e2e/modules/weather_current_spec.js

@@ -1,4 +1,3 @@
-const moment = require("moment");
 const helpers = require("../helpers/global-setup");
 const weatherFunc = require("../helpers/weather-functions");
 

tests/unit/functions/weather_object_spec.js

@@ -10,7 +10,7 @@ describe("WeatherObject", () => {
 	beforeAll(() => {
 		originalTimeZone = moment.tz.guess();
 		moment.tz.setDefault("Africa/Dar_es_Salaam");
-		weatherobject = new WeatherObject("metric", "metric", "metric", true);
+		weatherobject = new WeatherObject();
 	});
 
 	it("should return true for daytime at noon", () => {
@@ -25,10 +25,26 @@ describe("WeatherObject", () => {
 		expect(weatherobject.isDayTime()).toBe(false);
 	});
 
+	it("should return sunrise as the next sunaction", () => {
+		weatherobject.date = moment(2, "HH");
+		weatherobject.updateSunTime(-6.774877582342688, 37.63345667023327);
+		expect(weatherobject.nextSunAction()).toBe("sunrise");
+	});
+
+	it("should return sunset as the next sunaction", () => {
+		weatherobject.date = moment(14, "HH");
+		weatherobject.updateSunTime(-6.774877582342688, 37.63345667023327);
+		expect(weatherobject.nextSunAction()).toBe("sunset");
+	});
+
 	it("should convert windspeed correctly from mph to mps", () => {
 		expect(Math.round(weatherobject.convertWindToMetric(93.951324266285))).toBe(42);
 	});
 
+	it("should convert windspeed correctly from kmh to mps", () => {
+		expect(Math.round(weatherobject.convertWindToMs(151.2))).toBe(42);
+	});
+
 	it("should convert wind direction correctly from cardinal to value", () => {
 		expect(weatherobject.valueWindDirection("SSE")).toBe(157);
 	});