Skip to content

Commit 368c138

Browse files
committed
Removed old fetcher code and tests
1 parent e242d03 commit 368c138

File tree

13 files changed

+38
-4474
lines changed

13 files changed

+38
-4474
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,3 @@ jobs:
3939

4040
# Tests
4141
- run: npm test
42-
- run: npm run test-functional

MMM-OnThisDay.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const moduleDefinition = {
4343
/**
4444
* Separate events parsed from the HTML data.
4545
*/
46-
events: null,
46+
events: [],
4747

4848
/**
4949
* Event years for carousel model.
@@ -73,7 +73,6 @@ const moduleDefinition = {
7373
getScripts: function () {
7474
// prettier-ignore
7575
return [
76-
this.file('src/WikiCssSelectors.js'),
7776
this.file('src/ProgressUpdater.js'),
7877
];
7978
},
@@ -131,11 +130,8 @@ const moduleDefinition = {
131130
start: function () {
132131
Log.info('MMM-OnThisDay starting...');
133132

134-
// Check languages
135-
const configuredLanguage = this.config.language || config.language;
136-
if (WIKI_CSS_SELECTORS[configuredLanguage]) {
137-
this.usedLanguage = configuredLanguage;
138-
}
133+
// Determine languages
134+
this.usedLanguage = this.config.language || config.language;
139135
Log.info(`Using language ${this.usedLanguage}.`);
140136
},
141137

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
"scripts": {
1717
"cs-check": "prettier --check .",
1818
"cs-fix": "prettier --write .",
19-
"test": "nyc mocha test/unit --recursive",
20-
"test-functional": "mocha test/functional --recursive"
19+
"test": "nyc mocha test/unit --recursive"
2120
},
2221
"devDependencies": {
2322
"mocha": "^10.2.0",
@@ -33,8 +32,7 @@
3332
],
3433
"exclude": [
3534
"coverage",
36-
"test",
37-
"src/WikiCssSelectors.js"
35+
"test"
3836
],
3937
"cache": true,
4038
"all": true

src/HtmlFetcher.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/HtmlParser.js

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/WikiCssSelectors.js

Lines changed: 0 additions & 38 deletions
This file was deleted.

test/env/HelperTestEnv.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@ const NodeHelperFake = {
1515
},
1616
};
1717

18-
const htmlFetcherMock = {
18+
const wikimediaApiFetcherMock = {
1919
fetch: (language) => {
20-
return `
21-
<div id="mp-otd">
22-
<p>test title for ${language}</p>
23-
<ul><li>test events for ${language}</li></ul>
24-
</div>
25-
`;
20+
return [
21+
{
22+
text: `test events for ${language}`,
23+
},
24+
];
2625
},
2726
};
2827

@@ -38,7 +37,7 @@ const nodeHelperDefinition = proxyquire('../../node_helper', {
3837
module.exports = function () {
3938
const nodeHelper = Object.assign({}, nodeHelperDefinition);
4039

41-
nodeHelper.start(htmlFetcherMock, null, loggerMock);
40+
nodeHelper.start(wikimediaApiFetcherMock, loggerMock);
4241

4342
// Fake inherited methods
4443
nodeHelper.sendSocketNotification = sinon.fake();

test/env/ModuleTestEnv.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ Log = {
2424
// Load module definition
2525
const moduleDefinition = require('../../MMM-OnThisDay');
2626

27-
// Load Wiki CSS selectors
28-
WIKI_CSS_SELECTORS = require('../../src/WikiCssSelectors');
29-
3027
// Export new module with function mocks/fakes
3128
module.exports = function () {
3229
// Create module

test/functional/WikiSiteTest.js

Lines changed: 0 additions & 39 deletions
This file was deleted.

test/unit/HtmlParserTest.js

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)