adapt tests & Nah.sh profile to 12e61be

This commit is contained in:
Jannis R 2018-07-16 11:56:47 +02:00
parent e6130d7c23
commit c4511c949c
No known key found for this signature in database
GPG key ID: 0FE83946296A88A5
6 changed files with 16 additions and 15 deletions

View file

@ -84,7 +84,7 @@ const createParseMovement = (profile, opt, data) => {
const res = _parseMovement(m) const res = _parseMovement(m)
// filter out empty nextStops entries // filter out empty nextStops entries
res.nextStops = res.nextStops.filter((f) => { res.nextStops = res.nextStops.filter((f) => {
return f.station !== null || f.arrival !== null || f.departure !== null return f.stop !== null || f.arrival !== null || f.departure !== null
}) })
return res return res
} }

View file

@ -8,14 +8,14 @@ const testArrivals = co(function* (cfg) {
validate(t, arrs, 'arrivals', 'arrivals') validate(t, arrs, 'arrivals', 'arrivals')
t.ok(arrs.length > 0, 'must be >0 arrivals') t.ok(arrs.length > 0, 'must be >0 arrivals')
for (let i = 0; i < arrs.length; i++) { for (let i = 0; i < arrs.length; i++) {
let station = arrs[i].station let stop = arrs[i].stop
let name = `arrs[${i}].station` let name = `arrs[${i}].stop`
if (station.station) { if (stop.station) {
station = station.station stop = stop.station
name += '.station' name += '.station'
} }
t.equal(station.id, id, name + '.id is invalid') t.equal(stop.id, id, name + '.id is invalid')
} }
// todo: move into arrivals validator // todo: move into arrivals validator

View file

@ -8,14 +8,14 @@ const testDepartures = co(function* (cfg) {
validate(t, deps, 'departures', 'departures') validate(t, deps, 'departures', 'departures')
t.ok(deps.length > 0, 'must be >0 departures') t.ok(deps.length > 0, 'must be >0 departures')
for (let i = 0; i < deps.length; i++) { for (let i = 0; i < deps.length; i++) {
let station = deps[i].station let stop = deps[i].stop
let name = `deps[${i}].station` let name = `deps[${i}].stop`
if (station.station) { if (stop.station) {
station = station.station stop = stop.station
name += '.station' name += '.station'
} }
t.equal(station.id, id, name + '.id is invalid') t.equal(stop.id, id, name + '.id is invalid')
} }
// todo: move into deps validator // todo: move into deps validator

View file

@ -14,7 +14,8 @@ const testJourneysStationToAddress = co(function* (cfg) {
const j = journeys[i] const j = journeys[i]
const firstLeg = j.legs[0] const firstLeg = j.legs[0]
t.strictEqual(firstLeg.origin.id, fromId) const orig = firstLeg.origin.station || firstLeg.origin
t.ok(orig.id, fromId)
const d = j.legs[j.legs.length - 1].destination const d = j.legs[j.legs.length - 1].destination
const n = `journeys[0].legs[${i}].destination` const n = `journeys[0].legs[${i}].destination`

View file

@ -262,7 +262,7 @@ const createValidateArrivalOrDeparture = (cfg) => {
a.ok(dep.tripId, name + '.tripId must not be empty') a.ok(dep.tripId, name + '.tripId must not be empty')
a.strictEqual(typeof dep.trip, 'number', name + '.trip must be a number') a.strictEqual(typeof dep.trip, 'number', name + '.trip must be a number')
anyOf(['stop', 'station'], val, dep.station, name + '.station') anyOf(['stop', 'station'], val, dep.stop, name + '.stop')
assertValidWhen(dep.when, cfg.when, name) assertValidWhen(dep.when, cfg.when, name)
if (dep.delay !== null) { if (dep.delay !== null) {

View file

@ -246,8 +246,8 @@ test('departures at Wien Leibenfrostgasse', co(function* (t) {
for (let i = 0; i < deps.length; i++) { for (let i = 0; i < deps.length; i++) {
const dep = deps[i] const dep = deps[i]
const msg = `deps[${i}].station.id is invalid` const msg = `deps[${i}].stop.id is invalid`
t.ok(ids.includes(dep.station.id, msg)) t.ok(ids.includes(dep.stop.id, msg))
} }
t.end() t.end()