Skip to content

Commit

Permalink
User MORPH prefix for env vars
Browse files Browse the repository at this point in the history
  • Loading branch information
kremio committed Oct 25, 2018
1 parent 153689e commit f50c2ee
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions pipeline.js
Expand Up @@ -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
})
}

Expand Down
20 changes: 10 additions & 10 deletions tests/pipeline.test.js
Expand Up @@ -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()
Expand Down Expand Up @@ -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')
Expand All @@ -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
Expand All @@ -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() )
})
})

0 comments on commit f50c2ee

Please sign in to comment.