ppetru/opensprinkler-weather
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 'dev' into 'eto'

Browse Source
This commit is contained in:
Matthew Oslan
2019-06-30 16:33:54 -04:00
parent 03b1f4c341 e80439eff1
commit a248eaab53
13 changed files with 181 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
routes/weather.spec.ts
View File

@@ -5,7 +5,7 @@ import * as MockExpressResponse from 'mock-express-response';
import * as MockDate from 'mockdate';
import { getWateringData } from './weather';
import { GeoCoordinates, WateringData, WeatherData } from "../types";
import { GeoCoordinates, WeatherData, ZimmermanWateringData } from "../types";
import { WeatherProvider } from "./weatherProviders/WeatherProvider";
import { EToData } from "./adjustmentMethods/EToAdjustmentMethod";
@@ -78,8 +78,8 @@ export class MockWeatherProvider extends WeatherProvider {
this.mockData = mockData;
}
public async getWateringData( coordinates: GeoCoordinates ): Promise< WateringData > {
return await this.getData( "wateringData" ) as WateringData;
public async getWateringData( coordinates: GeoCoordinates ): Promise< ZimmermanWateringData > {
return await this.getData( "wateringData" ) as ZimmermanWateringData;
}
public async getWeatherData( coordinates: GeoCoordinates ): Promise< WeatherData > {
@@ -101,7 +101,7 @@ export class MockWeatherProvider extends WeatherProvider {
}
interface MockWeatherData {
wateringData?: WateringData,
wateringData?: ZimmermanWateringData,
weatherData?: WeatherData,
etoData?: EToData
}