From 60f02f4d7a76ca84f09986488aebf1b589ee2d66 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Thu, 25 Jan 2018 16:51:05 +0100 Subject: [PATCH] FIX: the previous commit was a little to early. Fixed 1aimmobilien provider --- lib/notification/notify.js | 12 +++++------ lib/provider/einsAImmobilien.js | 4 ++-- test/einsAImmobilien.test.js | 35 +++++++++++++++------------------ 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/lib/notification/notify.js b/lib/notification/notify.js index 2d79e20..a852503 100755 --- a/lib/notification/notify.js +++ b/lib/notification/notify.js @@ -3,15 +3,15 @@ const path = './adapter'; /** Read every integration existing in ./adapter **/ const adapter = fs - .readdirSync('./lib/notification/adapter') - .map(integPath => require(`${path}/${integPath}`)) - .filter(integration => integration.enabled()); + .readdirSync('./lib/notification/adapter') + .map(integPath => require(`${path}/${integPath}`)) + .filter(integration => integration.enabled()); if (adapter.length === 0) { - throw new Error('Please specify at least one notification provider'); + throw new Error('Please specify at least one notification provider'); } exports.send = (serviceName, payload) => { - //this is not being used in tests, therefor adapter are always set - return adapter.map(a => a.send(serviceName, payload)); + //this is not being used in tests, therefor adapter are always set + return adapter.map(a => a.send(serviceName, payload)); }; diff --git a/lib/provider/einsAImmobilien.js b/lib/provider/einsAImmobilien.js index 4d05978..6de0322 100755 --- a/lib/provider/einsAImmobilien.js +++ b/lib/provider/einsAImmobilien.js @@ -4,7 +4,7 @@ const utils = require('../utils'); function normalize(o) { const size = `${o.size.replace(' Wohnfläche ', '').trim()} / ${o.rooms.trim()}`; - const link = `https://www.1a-immobilienmarkt.de/expose/13691814${o.id}.html` + const link = `https://www.1a-immobilienmarkt.de/expose/${o.id}.html`; return Object.assign(o, { size, link }); } @@ -34,4 +34,4 @@ const einsAImmobilien = { filter: applyBlacklist }; -module.exports = new Fredy(einsAImmobilien); \ No newline at end of file +module.exports = new Fredy(einsAImmobilien); diff --git a/test/einsAImmobilien.test.js b/test/einsAImmobilien.test.js index a8fd1c1..e233d17 100644 --- a/test/einsAImmobilien.test.js +++ b/test/einsAImmobilien.test.js @@ -22,26 +22,23 @@ describe('#einsAImmobilien testsuite()', () => { expect(immonetDbContent.einsAImmobilien).to.be.a('array'); - // const notificationObj = mockNotification.get(); - // expect(notificationObj).to.be.a('object'); - // expect(notificationObj.serviceName).to.equal('einsAImmobilien'); - // - // /** check the actual structure **/ - // expect(notificationObj.payload.id).to.be.a('number'); - // expect(notificationObj.payload.price).to.be.a('string'); - // expect(notificationObj.payload.size).to.be.a('string'); - // expect(notificationObj.payload.title).to.be.a('string'); - // expect(notificationObj.payload.link).to.be.a('string'); - // expect(notificationObj.payload.address).to.be.a('string'); - // - // /** check the values if possible **/ - // expect(notificationObj.payload.id).to.equal(immonetDbContent.immonet[immonetDbContent.immonet.length - 1]); - // expect(notificationObj.payload.price).that.does.include('€'); - // expect(notificationObj.payload.size).that.does.include('m²'); - // expect(notificationObj.payload.title).to.be.not.empty; - // expect(notificationObj.payload.link).that.does.include('https://www.immonet.de'); - // expect(notificationObj.payload.address).to.be.not.empty; + const notificationObj = mockNotification.get(); + expect(notificationObj).to.be.a('object'); + expect(notificationObj.serviceName).to.equal('einsAImmobilien'); + /** check the actual structure **/ + expect(notificationObj.payload.id).to.be.a('number'); + expect(notificationObj.payload.price).to.be.a('string'); + expect(notificationObj.payload.size).to.be.a('string'); + expect(notificationObj.payload.title).to.be.a('string'); + expect(notificationObj.payload.link).to.be.a('string'); + + /** check the values if possible **/ + expect(notificationObj.payload.id).to.equal(immonetDbContent.einsAImmobilien[immonetDbContent.einsAImmobilien.length - 1]); + expect(notificationObj.payload.price).that.does.include('EUR'); + expect(notificationObj.payload.size).that.does.include('m²'); + expect(notificationObj.payload.title).to.be.not.empty; + expect(notificationObj.payload.link).that.does.include('https://www.1a-immobilienmarkt.de'); resolve(); }); });