From 9318007455bcd5a8ff7a8866e1a9ff66ee6cdb1e Mon Sep 17 00:00:00 2001 From: Jannis R Date: Fri, 30 Aug 2019 18:31:39 +0200 Subject: [PATCH] move profile E2E tests to test/e2e --- package.json | 5 +++-- test/{ => e2e}/bvg.js | 6 +++--- test/{ => e2e}/cfl.js | 6 +++--- test/{ => e2e}/cmta.js | 6 +++--- test/{ => e2e}/common.js | 6 +++--- test/{ => e2e}/db-busradar-nrw.js | 5 ++--- test/{ => e2e}/db.js | 6 +++--- test/{ => e2e}/hvv.js | 6 +++--- test/e2e/index.js | 16 ++++++++++++++++ test/{ => e2e}/insa.js | 6 +++--- test/{ => e2e}/lib/arrivals.js | 0 test/{ => e2e}/lib/departures-in-direction.js | 0 .../lib/departures-without-related-stations.js | 0 test/{ => e2e}/lib/departures.js | 0 test/{ => e2e}/lib/earlier-later-journeys.js | 0 .../lib/journeys-fails-with-no-product.js | 0 .../{ => e2e}/lib/journeys-station-to-address.js | 0 test/{ => e2e}/lib/journeys-station-to-poi.js | 0 .../{ => e2e}/lib/journeys-station-to-station.js | 0 test/{ => e2e}/lib/journeys-walking-speed.js | 0 test/{ => e2e}/lib/journeys-with-detour.js | 0 test/{ => e2e}/lib/leg-cycle-alternatives.js | 0 test/{ => e2e}/lib/reachable-from.js | 0 test/{ => e2e}/lib/refresh-journey.js | 0 test/{ => e2e}/lib/util.js | 0 test/{ => e2e}/lib/validate-fptf-with.js | 0 test/{ => e2e}/lib/validators.js | 0 test/{ => e2e}/lib/vbb-bvg-validators.js | 2 +- test/{ => e2e}/nahsh.js | 6 +++--- test/{ => e2e}/nvv.js | 6 +++--- test/{ => e2e}/oebb.js | 6 +++--- test/{ => e2e}/saarfahrplan.js | 6 +++--- test/{ => e2e}/sbahn-muenchen.js | 6 +++--- test/{ => e2e}/vbb.js | 6 +++--- test/{ => e2e}/vbn.js | 6 +++--- test/index.js | 15 --------------- 36 files changed, 64 insertions(+), 63 deletions(-) rename test/{ => e2e}/bvg.js (98%) rename test/{ => e2e}/cfl.js (97%) rename test/{ => e2e}/cmta.js (97%) rename test/{ => e2e}/common.js (92%) rename test/{ => e2e}/db-busradar-nrw.js (94%) rename test/{ => e2e}/db.js (98%) rename test/{ => e2e}/hvv.js (97%) create mode 100644 test/e2e/index.js rename test/{ => e2e}/insa.js (97%) rename test/{ => e2e}/lib/arrivals.js (100%) rename test/{ => e2e}/lib/departures-in-direction.js (100%) rename test/{ => e2e}/lib/departures-without-related-stations.js (100%) rename test/{ => e2e}/lib/departures.js (100%) rename test/{ => e2e}/lib/earlier-later-journeys.js (100%) rename test/{ => e2e}/lib/journeys-fails-with-no-product.js (100%) rename test/{ => e2e}/lib/journeys-station-to-address.js (100%) rename test/{ => e2e}/lib/journeys-station-to-poi.js (100%) rename test/{ => e2e}/lib/journeys-station-to-station.js (100%) rename test/{ => e2e}/lib/journeys-walking-speed.js (100%) rename test/{ => e2e}/lib/journeys-with-detour.js (100%) rename test/{ => e2e}/lib/leg-cycle-alternatives.js (100%) rename test/{ => e2e}/lib/reachable-from.js (100%) rename test/{ => e2e}/lib/refresh-journey.js (100%) rename test/{ => e2e}/lib/util.js (100%) rename test/{ => e2e}/lib/validate-fptf-with.js (100%) rename test/{ => e2e}/lib/validators.js (100%) rename test/{ => e2e}/lib/vbb-bvg-validators.js (97%) rename test/{ => e2e}/nahsh.js (98%) rename test/{ => e2e}/nvv.js (97%) rename test/{ => e2e}/oebb.js (98%) rename test/{ => e2e}/saarfahrplan.js (98%) rename test/{ => e2e}/sbahn-muenchen.js (97%) rename test/{ => e2e}/vbb.js (98%) rename test/{ => e2e}/vbn.js (97%) diff --git a/package.json b/package.json index 48d83d5c..d605150a 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,8 @@ "vbb-stations-autocomplete": "^4.1.0" }, "scripts": { - "test": "env NODE_ENV=dev node test/index.js", - "prepublishOnly": "npm test | tap-spec" + "e2e-test": "env NODE_ENV=dev node test/e2e/index.js | tap-spec", + "test": "npm run e2e-test", + "prepublishOnly": "npm test" } } diff --git a/test/bvg.js b/test/e2e/bvg.js similarity index 98% rename from test/bvg.js rename to test/e2e/bvg.js index ab3c74bc..97c3e429 100644 --- a/test/bvg.js +++ b/test/e2e/bvg.js @@ -11,9 +11,9 @@ const isRoughlyEqual = require('is-roughly-equal') const {DateTime} = require('luxon') const flatMap = require('lodash/flatMap') -const createClient = require('..') -const bvgProfile = require('../p/bvg') -const products = require('../p/bvg/products') +const createClient = require('../..') +const bvgProfile = require('../../p/bvg') +const products = require('../../p/bvg/products') const createValidate = require('./lib/validate-fptf-with') const { cfg, diff --git a/test/cfl.js b/test/e2e/cfl.js similarity index 97% rename from test/cfl.js rename to test/e2e/cfl.js index a9dc15fc..d5e57585 100644 --- a/test/cfl.js +++ b/test/e2e/cfl.js @@ -6,9 +6,9 @@ const tape = require('tape') const isRoughlyEqual = require('is-roughly-equal') const {createWhen} = require('./lib/util') -const createClient = require('..') -const cflProfile = require('../p/cfl') -const products = require('../p/cfl/products') +const createClient = require('../..') +const cflProfile = require('../../p/cfl') +const products = require('../../p/cfl/products') const { line: createValidateLine, journeyLeg: createValidateJourneyLeg, diff --git a/test/cmta.js b/test/e2e/cmta.js similarity index 97% rename from test/cmta.js rename to test/e2e/cmta.js index ce448781..b1ba2b52 100644 --- a/test/cmta.js +++ b/test/e2e/cmta.js @@ -5,9 +5,9 @@ const tapePromise = require('tape-promise').default const tape = require('tape') const {createWhen} = require('./lib/util') -const createClient = require('..') -const cmtaProfile = require('../p/cmta') -const products = require('../p/cmta/products') +const createClient = require('../..') +const cmtaProfile = require('../../p/cmta') +const products = require('../../p/cmta/products') const createValidate = require('./lib/validate-fptf-with') const testJourneysStationToStation = require('./lib/journeys-station-to-station') const testJourneysStationToAddress = require('./lib/journeys-station-to-address') diff --git a/test/common.js b/test/e2e/common.js similarity index 92% rename from test/common.js rename to test/e2e/common.js index 0d726f13..8af5243f 100644 --- a/test/common.js +++ b/test/e2e/common.js @@ -2,9 +2,9 @@ const test = require('tape') -const createClient = require('..') -const vbbProfile = require('../p/vbb') -const parseDateTime = require('../parse/date-time') +const createClient = require('../..') +const vbbProfile = require('../../p/vbb') +const parseDateTime = require('../../parse/date-time') // todo: use a mock profile const client = createClient(vbbProfile, 'public-transport/hafas-client:test') diff --git a/test/db-busradar-nrw.js b/test/e2e/db-busradar-nrw.js similarity index 94% rename from test/db-busradar-nrw.js rename to test/e2e/db-busradar-nrw.js index 3b8c27e2..af2f8e72 100644 --- a/test/db-busradar-nrw.js +++ b/test/e2e/db-busradar-nrw.js @@ -5,12 +5,11 @@ const tape = require('tape') const isRoughlyEqual = require('is-roughly-equal') const {createWhen} = require('./lib/util') -const createClient = require('..') -const dbBusradarNrwProfile = require('../p/db-busradar-nrw') +const createClient = require('../..') +const dbBusradarNrwProfile = require('../../p/db-busradar-nrw') const createValidate = require('./lib/validate-fptf-with') const testDepartures = require('./lib/departures') const testArrivals = require('./lib/arrivals') -// const testJourneysWithDetour = require('./lib/journeys-with-detour') const isObj = o => o !== null && 'object' === typeof o && !Array.isArray(o) diff --git a/test/db.js b/test/e2e/db.js similarity index 98% rename from test/db.js rename to test/e2e/db.js index c5a96c9c..5609250d 100644 --- a/test/db.js +++ b/test/e2e/db.js @@ -7,9 +7,9 @@ const tape = require('tape') const isRoughlyEqual = require('is-roughly-equal') const {createWhen} = require('./lib/util') -const createClient = require('..') -const dbProfile = require('../p/db') -const products = require('../p/db/products') +const createClient = require('../..') +const dbProfile = require('../../p/db') +const products = require('../../p/db/products') const { station: createValidateStation, trip: createValidateTrip diff --git a/test/hvv.js b/test/e2e/hvv.js similarity index 97% rename from test/hvv.js rename to test/e2e/hvv.js index 061a75fc..c3c9840a 100644 --- a/test/hvv.js +++ b/test/e2e/hvv.js @@ -5,9 +5,9 @@ const tape = require('tape') const isRoughlyEqual = require('is-roughly-equal') const {createWhen} = require('./lib/util') -const createClient = require('..') -const hvvProfile = require('../p/hvv') -const products = require('../p/hvv/products') +const createClient = require('../..') +const hvvProfile = require('../../p/hvv') +const products = require('../../p/hvv/products') const createValidate = require('./lib/validate-fptf-with') const testJourneysStationToStation = require('./lib/journeys-station-to-station') const journeysFailsWithNoProduct = require('./lib/journeys-fails-with-no-product') diff --git a/test/e2e/index.js b/test/e2e/index.js new file mode 100644 index 00000000..71cde318 --- /dev/null +++ b/test/e2e/index.js @@ -0,0 +1,16 @@ +'use strict' + +require('./common') +require('./db') +require('./vbb') +require('./bvg') +require('./oebb') +require('./insa') +require('./nahsh') +require('./cmta') +require('./nvv') +require('./sbahn-muenchen') +require('./saarfahrplan') +require('./cfl') +require('./hvv') +require('./db-busradar-nrw') diff --git a/test/insa.js b/test/e2e/insa.js similarity index 97% rename from test/insa.js rename to test/e2e/insa.js index 5866c2f6..3d98c4e8 100644 --- a/test/insa.js +++ b/test/e2e/insa.js @@ -5,9 +5,9 @@ const tape = require('tape') const isRoughlyEqual = require('is-roughly-equal') const {createWhen} = require('./lib/util') -const createClient = require('..') -const insaProfile = require('../p/insa') -const products = require('../p/insa/products') +const createClient = require('../..') +const insaProfile = require('../../p/insa') +const products = require('../../p/insa/products') const createValidate = require('./lib/validate-fptf-with') const testJourneysStationToStation = require('./lib/journeys-station-to-station') const testJourneysStationToAddress = require('./lib/journeys-station-to-address') diff --git a/test/lib/arrivals.js b/test/e2e/lib/arrivals.js similarity index 100% rename from test/lib/arrivals.js rename to test/e2e/lib/arrivals.js diff --git a/test/lib/departures-in-direction.js b/test/e2e/lib/departures-in-direction.js similarity index 100% rename from test/lib/departures-in-direction.js rename to test/e2e/lib/departures-in-direction.js diff --git a/test/lib/departures-without-related-stations.js b/test/e2e/lib/departures-without-related-stations.js similarity index 100% rename from test/lib/departures-without-related-stations.js rename to test/e2e/lib/departures-without-related-stations.js diff --git a/test/lib/departures.js b/test/e2e/lib/departures.js similarity index 100% rename from test/lib/departures.js rename to test/e2e/lib/departures.js diff --git a/test/lib/earlier-later-journeys.js b/test/e2e/lib/earlier-later-journeys.js similarity index 100% rename from test/lib/earlier-later-journeys.js rename to test/e2e/lib/earlier-later-journeys.js diff --git a/test/lib/journeys-fails-with-no-product.js b/test/e2e/lib/journeys-fails-with-no-product.js similarity index 100% rename from test/lib/journeys-fails-with-no-product.js rename to test/e2e/lib/journeys-fails-with-no-product.js diff --git a/test/lib/journeys-station-to-address.js b/test/e2e/lib/journeys-station-to-address.js similarity index 100% rename from test/lib/journeys-station-to-address.js rename to test/e2e/lib/journeys-station-to-address.js diff --git a/test/lib/journeys-station-to-poi.js b/test/e2e/lib/journeys-station-to-poi.js similarity index 100% rename from test/lib/journeys-station-to-poi.js rename to test/e2e/lib/journeys-station-to-poi.js diff --git a/test/lib/journeys-station-to-station.js b/test/e2e/lib/journeys-station-to-station.js similarity index 100% rename from test/lib/journeys-station-to-station.js rename to test/e2e/lib/journeys-station-to-station.js diff --git a/test/lib/journeys-walking-speed.js b/test/e2e/lib/journeys-walking-speed.js similarity index 100% rename from test/lib/journeys-walking-speed.js rename to test/e2e/lib/journeys-walking-speed.js diff --git a/test/lib/journeys-with-detour.js b/test/e2e/lib/journeys-with-detour.js similarity index 100% rename from test/lib/journeys-with-detour.js rename to test/e2e/lib/journeys-with-detour.js diff --git a/test/lib/leg-cycle-alternatives.js b/test/e2e/lib/leg-cycle-alternatives.js similarity index 100% rename from test/lib/leg-cycle-alternatives.js rename to test/e2e/lib/leg-cycle-alternatives.js diff --git a/test/lib/reachable-from.js b/test/e2e/lib/reachable-from.js similarity index 100% rename from test/lib/reachable-from.js rename to test/e2e/lib/reachable-from.js diff --git a/test/lib/refresh-journey.js b/test/e2e/lib/refresh-journey.js similarity index 100% rename from test/lib/refresh-journey.js rename to test/e2e/lib/refresh-journey.js diff --git a/test/lib/util.js b/test/e2e/lib/util.js similarity index 100% rename from test/lib/util.js rename to test/e2e/lib/util.js diff --git a/test/lib/validate-fptf-with.js b/test/e2e/lib/validate-fptf-with.js similarity index 100% rename from test/lib/validate-fptf-with.js rename to test/e2e/lib/validate-fptf-with.js diff --git a/test/lib/validators.js b/test/e2e/lib/validators.js similarity index 100% rename from test/lib/validators.js rename to test/e2e/lib/validators.js diff --git a/test/lib/vbb-bvg-validators.js b/test/e2e/lib/vbb-bvg-validators.js similarity index 97% rename from test/lib/vbb-bvg-validators.js rename to test/e2e/lib/vbb-bvg-validators.js index ddab067b..4cbcace8 100644 --- a/test/lib/vbb-bvg-validators.js +++ b/test/e2e/lib/vbb-bvg-validators.js @@ -3,7 +3,7 @@ const stations = require('vbb-stations-autocomplete') const a = require('assert') const shorten = require('vbb-short-station-name') -const products = require('../../p/bvg/products') +const products = require('../../../p/bvg/products') const {createWhen} = require('./util') const { diff --git a/test/nahsh.js b/test/e2e/nahsh.js similarity index 98% rename from test/nahsh.js rename to test/e2e/nahsh.js index 3b01f9fe..279698c7 100644 --- a/test/nahsh.js +++ b/test/e2e/nahsh.js @@ -5,9 +5,9 @@ const tape = require('tape') const isRoughlyEqual = require('is-roughly-equal') const {createWhen} = require('./lib/util') -const createClient = require('..') -const nahshProfile = require('../p/nahsh') -const products = require('../p/nahsh/products') +const createClient = require('../..') +const nahshProfile = require('../../p/nahsh') +const products = require('../../p/nahsh/products') const { line: createValidateLine, station: createValidateStation diff --git a/test/nvv.js b/test/e2e/nvv.js similarity index 97% rename from test/nvv.js rename to test/e2e/nvv.js index 9159d1af..b6910ba8 100644 --- a/test/nvv.js +++ b/test/e2e/nvv.js @@ -5,9 +5,9 @@ const tape = require('tape') const isRoughlyEqual = require('is-roughly-equal') const {createWhen} = require('./lib/util') -const createClient = require('..') -const nvvProfile = require('../p/nvv') -const products = require('../p/nvv/products') +const createClient = require('../..') +const nvvProfile = require('../../p/nvv') +const products = require('../../p/nvv/products') const createValidate = require('./lib/validate-fptf-with') const testJourneysStationToStation = require('./lib/journeys-station-to-station') const journeysFailsWithNoProduct = require('./lib/journeys-fails-with-no-product') diff --git a/test/oebb.js b/test/e2e/oebb.js similarity index 98% rename from test/oebb.js rename to test/e2e/oebb.js index 706acfb5..ed62756a 100644 --- a/test/oebb.js +++ b/test/e2e/oebb.js @@ -6,9 +6,9 @@ const isRoughlyEqual = require('is-roughly-equal') const validateLine = require('validate-fptf/line') const {createWhen} = require('./lib/util') -const createClient = require('..') -const oebbProfile = require('../p/oebb') -const products = require('../p/oebb/products') +const createClient = require('../..') +const oebbProfile = require('../../p/oebb') +const products = require('../../p/oebb/products') const { station: createValidateStation, stop: validateStop diff --git a/test/saarfahrplan.js b/test/e2e/saarfahrplan.js similarity index 98% rename from test/saarfahrplan.js rename to test/e2e/saarfahrplan.js index 3f9deff7..56dd8d34 100644 --- a/test/saarfahrplan.js +++ b/test/e2e/saarfahrplan.js @@ -5,9 +5,9 @@ const tape = require('tape') const isRoughlyEqual = require('is-roughly-equal') const { createWhen } = require('./lib/util') -const createClient = require('..') -const saarfahrplanProfile = require('../p/saarfahrplan') -const products = require('../p/saarfahrplan/products') +const createClient = require('../..') +const saarfahrplanProfile = require('../../p/saarfahrplan') +const products = require('../../p/saarfahrplan/products') const { station: createValidateStation, stop: validateStop diff --git a/test/sbahn-muenchen.js b/test/e2e/sbahn-muenchen.js similarity index 97% rename from test/sbahn-muenchen.js rename to test/e2e/sbahn-muenchen.js index ff7852a2..ecae7d80 100644 --- a/test/sbahn-muenchen.js +++ b/test/e2e/sbahn-muenchen.js @@ -5,9 +5,9 @@ const tapePromise = require('tape-promise').default const tape = require('tape') const {createWhen} = require('./lib/util') -const createClient = require('..') -const sMunichProfile = require('../p/sbahn-muenchen') -const products = require('../p/sbahn-muenchen/products') +const createClient = require('../..') +const sMunichProfile = require('../../p/sbahn-muenchen') +const products = require('../../p/sbahn-muenchen/products') const {movement: _validateMovement} = require('./lib/validators') const createValidate = require('./lib/validate-fptf-with') const testJourneysStationToStation = require('./lib/journeys-station-to-station') diff --git a/test/vbb.js b/test/e2e/vbb.js similarity index 98% rename from test/vbb.js rename to test/e2e/vbb.js index 5cb1db0b..faf273d3 100644 --- a/test/vbb.js +++ b/test/e2e/vbb.js @@ -3,9 +3,9 @@ const tapePromise = require('tape-promise').default const tape = require('tape') -const createClient = require('..') -const vbbProfile = require('../p/vbb') -const products = require('../p/vbb/products') +const createClient = require('../..') +const vbbProfile = require('../../p/vbb') +const products = require('../../p/vbb/products') const { cfg, validateStation, diff --git a/test/vbn.js b/test/e2e/vbn.js similarity index 97% rename from test/vbn.js rename to test/e2e/vbn.js index 7e1378d4..12064034 100644 --- a/test/vbn.js +++ b/test/e2e/vbn.js @@ -5,9 +5,9 @@ const tape = require('tape') const isRoughlyEqual = require('is-roughly-equal') const {createWhen} = require('./lib/util') -const createClient = require('..') -const vbnProfile = require('../p/vbn') -const products = require('../p/vbn/products') +const createClient = require('../..') +const vbnProfile = require('../../p/vbn') +const products = require('../../p/vbn/products') const createValidate = require('./lib/validate-fptf-with') const testJourneysStationToStation = require('./lib/journeys-station-to-station') const testJourneysStationToAddress = require('./lib/journeys-station-to-address') diff --git a/test/index.js b/test/index.js index 4cc86847..e480eedc 100644 --- a/test/index.js +++ b/test/index.js @@ -4,20 +4,5 @@ require('./bvg-journey') require('./vbb-departures') require('./bvg-radar') -require('./common') -require('./db') -require('./vbb') -require('./bvg') -require('./oebb') -require('./insa') -require('./nahsh') -require('./cmta') -require('./nvv') -require('./sbahn-muenchen') -require('./saarfahrplan') -require('./cfl') -require('./hvv') -require('./db-busradar-nrw') - require('./throttle') require('./retry')