fix: hackernews-datahub remove egg-datahub (#90)

<!--
Thank you for your pull request. Please review below requirements.
Bug fixes and new features should include tests and possibly benchmarks.
Contributors guide: https://github.com/eggjs/egg/blob/master/CONTRIBUTING.md

感谢您贡献代码。请确认下列 checklist 的完成情况。
Bug 修复和新功能必须包含测试，必要时请附上性能测试。
Contributors guide: https://github.com/eggjs/egg/blob/master/CONTRIBUTING.md
-->

##### Checklist
<!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->

- [x] `npm test` passes
- [ x] tests and/or benchmarks are included
- [ x] documentation is changed or added
- [ x] commit message follows commit guidelines

##### Affected core subsystem(s)
<!-- Provide affected core subsystem(s). -->

remove `egg-datahub` from `hackernews-datahub`

hackernews-datahub/README.md

@@ -24,6 +24,7 @@ $ npm run test
 ## E2E Test
 
 ```bash
+$ npm run datahub
 $ npm run dev:e2e
 $ npm run test:e2e
 ```

hackernews-datahub/config/config.default.js

@@ -2,6 +2,7 @@
 
 const fs = require('fs');
 const path = require('path');
+const datahubConfig = require('../macaca-datahub.config');
 
 module.exports = appInfo => {
   const config = {};
@@ -13,7 +14,7 @@ module.exports = appInfo => {
     '/favicon.ico': fs.readFileSync(path.join(appInfo.baseDir, 'app/public/favicon.png')),
   };
 
-  const mockPort = 5678;
+  const mockPort = datahubConfig.port;
   const hubName = 'hackernews';
 
   config.news = {
@@ -31,13 +32,6 @@ module.exports = appInfo => {
     },
   };
 
-  // https://github.com/macacajs/macaca-datahub#configuration
-
-  config.datahub = {
-    port: mockPort,
-    store: path.resolve(__dirname, '..', 'data'),
-  };
-
   return config;
 };
 

hackernews-datahub/config/plugin.js

@@ -5,8 +5,3 @@ exports.nunjucks = {
   package: 'egg-view-nunjucks',
 };
 
-exports.datahub = {
-  enable: true,
-  package: 'egg-datahub',
-};
-

hackernews-datahub/macaca-datahub.config.js

@@ -0,0 +1,9 @@
+'use strict';
+
+const path = require('path');
+
+module.exports = {
+  mode: 'local',
+  port: 5678, // must be 5678, same with datahub-nodejs-sdk's default port
+  store: path.resolve(__dirname, 'data'),
+};

hackernews-datahub/package.json

@@ -17,11 +17,11 @@
     "chai": "^4.1.2",
     "cross-env": "^5.1.5",
     "egg-bin": "^4.3.5",
-    "egg-datahub": "2",
     "egg-mock": "^3.13.1",
     "eslint": "^4.12.0",
     "eslint-config-egg": "^5.1.1",
     "macaca-cli": "^2.1.2",
+    "macaca-datahub": "^2.3.5",
     "macaca-electron": "2",
     "macaca-wd": "2"
   },
@@ -31,6 +31,7 @@
   "scripts": {
     "dev": "egg-bin dev",
     "test": "egg-bin test test/unittest",
+    "datahub": "datahub server -c macaca-datahub.config.js --verbose",
     "dev:e2e": "cross-env NODE_ENV=test MOCK=true egg-bin dev",
     "test:e2e": "cross-env NODE_ENV=test macaca run --f_options '--opts test/e2e/mocha.opts' -d ./test/e2e",
     "cov": "egg-bin cov",

hackernews-datahub/test/e2e/datahub.test.js

@@ -22,6 +22,7 @@ describe('test/datahub.test.js', () => {
 
     afterEach(function() {
       return driver
+        .coverage()
         .saveScreenshots(this);
     });
 
@@ -44,8 +45,8 @@ describe('test/datahub.test.js', () => {
           scene: 'default',
         })
         .getUrl(BASE_URL)
-        .sleep(1000)
-        .hasText('#wrapper > div.news-view.view.v-transition > div:nth-child(10) > span', '10');
+        .elementByCss('#wrapper > div.news-view.view.v-transition > div:nth-child(10) > span')
+        .hasText('10');
     });
 
     it('list20 render should be ok', async function() {
@@ -56,8 +57,8 @@ describe('test/datahub.test.js', () => {
           scene: 'list20',
         })
         .getUrl(BASE_URL)
-        .sleep(1000)
-        .hasText('#wrapper > div.news-view.view.v-transition > div:nth-child(20) > span', '20');
+        .elementByCss('#wrapper > div.news-view.view.v-transition > div:nth-child(20) > span')
+        .hasText('20');
     });
 
     it('list5 render should be ok', async function() {
@@ -68,8 +69,8 @@ describe('test/datahub.test.js', () => {
           scene: 'list5',
         })
         .getUrl(BASE_URL)
-        .sleep(1000)
-        .hasText('#wrapper > div.news-view.view.v-transition > div:nth-child(5) > span', '5');
+        .elementByCss('#wrapper > div.news-view.view.v-transition > div:nth-child(5) > span')
+        .hasText('5');
     });
 
     it('list0 render should be empty', async function() {
@@ -80,8 +81,8 @@ describe('test/datahub.test.js', () => {
           scene: 'empty',
         })
         .getUrl(BASE_URL)
-        .sleep(1000)
-        .hasText('#wrapper > div.news-view.view.v-transition > p', 'empty');
+        .elementByCss('#wrapper > div.news-view.view.v-transition > p')
+        .hasText('empty');
     });
   });
 });