From e46514c5f97616c7901e91894523206c297f63f4 Mon Sep 17 00:00:00 2001 From: Jannis R Date: Sat, 21 May 2022 11:53:35 +0200 Subject: [PATCH] =?UTF-8?q?DB:=20rename=20regionalExp=20product=20to=20reg?= =?UTF-8?q?ionalExpress=20=F0=9F=92=A5=E2=9C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- p/db/products.js | 2 +- test/e2e/db.js | 2 +- test/fixtures/db-arrivals.js | 4 +- test/fixtures/db-journey-2.js | 72 ++++++++++++++-------------- test/fixtures/db-journey-polyline.js | 12 ++--- test/fixtures/db-journey.js | 12 ++--- test/fixtures/db-stop.js | 28 +++++------ 7 files changed, 66 insertions(+), 66 deletions(-) diff --git a/p/db/products.js b/p/db/products.js index ff79203e..219bad46 100644 --- a/p/db/products.js +++ b/p/db/products.js @@ -17,7 +17,7 @@ const products = [ default: true }, { - id: 'regionalExp', // todo: rename + id: 'regionalExpress', mode: 'train', bitmasks: [4], name: 'RegionalExpress & InterRegio', diff --git a/test/e2e/db.js b/test/e2e/db.js index 840469b6..37704af1 100644 --- a/test/e2e/db.js +++ b/test/e2e/db.js @@ -270,7 +270,7 @@ tap.skip('journeysFromTrip – U Mehringdamm to U Naturkundemuseum, reroute to S // Find a vehicle from U Mehringdamm to U Stadtmitte (to the north) that is currently // between these two stations. const {trip, prevStopover} = await findTripBetween(blnMehringdamm, blnStadtmitte, { - regionalExp: false, regional: false, suburban: false + regionalExpress: false, regional: false, suburban: false }) t.ok(trip, 'precondition failed: trip not found') t.ok(prevStopover, 'precondition failed: previous stopover missing') diff --git a/test/fixtures/db-arrivals.js b/test/fixtures/db-arrivals.js index 1bb56288..6b4a88e4 100644 --- a/test/fixtures/db-arrivals.js +++ b/test/fixtures/db-arrivals.js @@ -14,7 +14,7 @@ const dbArrivals = [ products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -36,7 +36,7 @@ const dbArrivals = [ products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, diff --git a/test/fixtures/db-journey-2.js b/test/fixtures/db-journey-2.js index 5d6575cc..ae777209 100644 --- a/test/fixtures/db-journey-2.js +++ b/test/fixtures/db-journey-2.js @@ -15,7 +15,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: false, @@ -38,7 +38,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -94,7 +94,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: false, @@ -131,7 +131,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -195,7 +195,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -218,7 +218,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -240,7 +240,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -276,7 +276,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -298,7 +298,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -322,7 +322,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: false, @@ -344,7 +344,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: false, @@ -396,7 +396,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -418,7 +418,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -456,7 +456,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -478,7 +478,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -516,7 +516,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -538,7 +538,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -576,7 +576,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -598,7 +598,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -636,7 +636,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -673,7 +673,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -710,7 +710,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -747,7 +747,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -769,7 +769,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -807,7 +807,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: false, bus: true, @@ -829,7 +829,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: false, bus: true, @@ -867,7 +867,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -889,7 +889,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -927,7 +927,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -949,7 +949,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -987,7 +987,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: true, @@ -1024,7 +1024,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: false, @@ -1046,7 +1046,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: false, @@ -1087,7 +1087,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: false, @@ -1109,7 +1109,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: false, @@ -1133,7 +1133,7 @@ const dbJourney = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: false, diff --git a/test/fixtures/db-journey-polyline.js b/test/fixtures/db-journey-polyline.js index 307036e5..75f063c4 100644 --- a/test/fixtures/db-journey-polyline.js +++ b/test/fixtures/db-journey-polyline.js @@ -15,7 +15,7 @@ const dbJourneyPolyline = { products: { nationalExpress: true, national: true, - regionalExp: true, + regionalExpress: true, regional: true, suburban: true, bus: true, @@ -37,7 +37,7 @@ const dbJourneyPolyline = { products: { nationalExpress: true, national: true, - regionalExp: true, + regionalExpress: true, regional: true, suburban: true, bus: true, @@ -61,7 +61,7 @@ const dbJourneyPolyline = { products: { nationalExpress: true, national: true, - regionalExp: true, + regionalExpress: true, regional: true, suburban: true, bus: true, @@ -98,7 +98,7 @@ const dbJourneyPolyline = { products: { nationalExpress: true, national: true, - regionalExp: true, + regionalExpress: true, regional: true, suburban: true, bus: true, @@ -120,7 +120,7 @@ const dbJourneyPolyline = { products: { nationalExpress: true, national: true, - regionalExp: true, + regionalExpress: true, regional: true, suburban: true, bus: true, @@ -3927,7 +3927,7 @@ const dbJourneyPolyline = { 'products': { 'nationalExpress': true, 'national': true, - 'regionalExp': true, + 'regionalExpress': true, 'regional': true, 'suburban': true, 'bus': true, diff --git a/test/fixtures/db-journey.js b/test/fixtures/db-journey.js index 5df1b48f..ffa002b7 100644 --- a/test/fixtures/db-journey.js +++ b/test/fixtures/db-journey.js @@ -15,7 +15,7 @@ const dbJourney = { products: { nationalExpress: true, national: true, - regionalExp: true, + regionalExpress: true, regional: true, suburban: true, bus: true, @@ -38,7 +38,7 @@ const dbJourney = { products: { nationalExpress: true, national: true, - regionalExp: true, + regionalExpress: true, regional: true, suburban: true, bus: true, @@ -60,7 +60,7 @@ const dbJourney = { products: { nationalExpress: true, national: true, - regionalExp: true, + regionalExpress: true, regional: true, suburban: true, bus: true, @@ -96,7 +96,7 @@ const dbJourney = { products: { nationalExpress: true, national: true, - regionalExp: true, + regionalExpress: true, regional: true, suburban: true, bus: true, @@ -118,7 +118,7 @@ const dbJourney = { products: { nationalExpress: true, national: true, - regionalExp: true, + regionalExpress: true, regional: true, suburban: true, bus: true, @@ -142,7 +142,7 @@ const dbJourney = { products: { nationalExpress: true, national: true, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, diff --git a/test/fixtures/db-stop.js b/test/fixtures/db-stop.js index 44c3dc2d..2d865f91 100644 --- a/test/fixtures/db-stop.js +++ b/test/fixtures/db-stop.js @@ -43,7 +43,7 @@ const station = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -80,7 +80,7 @@ const dbStop = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -110,7 +110,7 @@ const dbStop = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -140,7 +140,7 @@ const dbStop = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -170,7 +170,7 @@ const dbStop = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -200,7 +200,7 @@ const dbStop = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -229,7 +229,7 @@ const dbStop = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -259,7 +259,7 @@ const dbStop = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -289,7 +289,7 @@ const dbStop = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -318,7 +318,7 @@ const dbStop = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -348,7 +348,7 @@ const dbStop = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -377,7 +377,7 @@ const dbStop = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -406,7 +406,7 @@ const dbStop = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: true, suburban: true, bus: true, @@ -435,7 +435,7 @@ const dbStop = { products: { nationalExpress: false, national: false, - regionalExp: false, + regionalExpress: false, regional: false, suburban: false, bus: false,