From f50c2ee3603c0cabe3fb158b68dade9afe22c990 Mon Sep 17 00:00:00 2001 From: Kremio Software Date: Thu, 25 Oct 2018 16:18:07 +0200 Subject: [PATCH] User MORPH prefix for env vars --- pipeline.js | 6 +++--- tests/pipeline.test.js | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pipeline.js b/pipeline.js index acec338..771a79d 100644 --- a/pipeline.js +++ b/pipeline.js @@ -30,10 +30,10 @@ const pipeline = async () => getDB( path.resolve('./config/database.json'), fals .then( async (scraperOptions) => { //Parameters passed by env variables have priority - if( process.env.SCRAPER_START_PAGE && process.env.SCRAPER_START_REPORT ){ + if( process.env.MORPH_START_PAGE && process.env.MORPH_START_REPORT ){ return Object.assign( scraperOptions, { - startAtReportURI: process.env.SCRAPER_START_REPORT, - startAtPageURL: process.env.SCRAPER_START_PAGE + startAtReportURI: process.env.MORPH_START_REPORT, + startAtPageURL: process.env.MORPH_START_PAGE }) } diff --git a/tests/pipeline.test.js b/tests/pipeline.test.js index cf93773..a778702 100644 --- a/tests/pipeline.test.js +++ b/tests/pipeline.test.js @@ -16,8 +16,8 @@ describe( 'Scraper pipeline', () => { let db beforeEach( async (done) => { - delete process.env.SCRAPER_START_PAGE - delete process.env.SCRAPER_START_REPORT + delete process.env.MORPH_START_PAGE + delete process.env.MORPH_START_REPORT scrape.mockReset() InsertStream.mockReset() @@ -174,8 +174,8 @@ describe( 'Scraper pipeline', () => { test( 'Start from given page and report given by environment variables', async() => { jest.resetModules() - process.env.SCRAPER_START_PAGE = "envStartPage" - process.env.SCRAPER_START_REPORT = "envStartReport" + process.env.MORPH_START_PAGE = "envStartPage" + process.env.MORPH_START_REPORT = "envStartReport" const _pipeline = require('../pipeline') const _scrape = require('../scrape') @@ -185,16 +185,16 @@ describe( 'Scraper pipeline', () => { }catch(e){} expect( _scrape ).toBeCalledWith( expect.objectContaining({ - startAtPageURL: process.env.SCRAPER_START_PAGE, - startAtReportURI: process.env.SCRAPER_START_REPORT + startAtPageURL: process.env.MORPH_START_PAGE, + startAtReportURI: process.env.MORPH_START_REPORT }), expect.anything() ) }) test( 'Parameters passed by env variables have priority over error', async() => { jest.resetModules() - process.env.SCRAPER_START_PAGE = "envStartPage2" - process.env.SCRAPER_START_REPORT = "envStartReport2" + process.env.MORPH_START_PAGE = "envStartPage2" + process.env.MORPH_START_REPORT = "envStartReport2" const {DB} = await require('rwv-sqlite/lib/db')() db = DB @@ -212,8 +212,8 @@ describe( 'Scraper pipeline', () => { }catch(e){} expect( _scrape ).toBeCalledWith( expect.objectContaining({ - startAtPageURL: process.env.SCRAPER_START_PAGE, - startAtReportURI: process.env.SCRAPER_START_REPORT + startAtPageURL: process.env.MORPH_START_PAGE, + startAtReportURI: process.env.MORPH_START_REPORT }), expect.anything() ) }) })