style(progressive):upgrade to egg2.x #49
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
SunShinewyf
commented
Dec 8, 2017
SunShinewyf
commented
- 书写风格升级到Egg2.x
- 修改了一下readme
- 更新了一些依赖
atian25
requested changes
Dec 8, 2017
.travis.yml
Outdated
| @@ -2,11 +2,7 @@ sudo: false | |||
| language: node_js | |||
| node_js: | |||
| - '8' | |||
| services: | |||
| - postgresql | |||
progressive/step1/test/index.test.js
Outdated
| @@ -1,18 +1,18 @@ | |||
| 'use strict'; | |||
|
|
|||
|
|
|||
| const mm = require('egg-mock'); | |||
| const { mock } = require('egg-mock/bootstrap') | |||
|
|
|||
| describe('test/index.test.js', () => { | |||
| let app; | |||
|
|
|||
| before(() => { | |||
There was a problem hiding this comment.
不需要 before after 等了，直接从 bootstrap 里面拿到 app 即可
progressive/step2/app/router.js
Outdated
| @@ -1,5 +1,6 @@ | |||
| 'use strict'; | |||
|
|
|||
| module.exports = app => { | |||
| app.router.get('/', app.controller.home.isIOS); | |||
| const {router,controller} = app; | |||
There was a problem hiding this comment.
逗号后面少个空格，是不是 eslintignore 里面忽略了？把 fixture 干掉
There was a problem hiding this comment.
这个是eslint的原因，没控制好代码格式，“把fixture干掉”是什么意思，删掉fixture这个目录？
SunShinewyf
changed the title
|
去掉 .eslintignore 中 test/fixture 那一行，重新跑 lint
发自我的 iPhone
… 在 2017年12月9日，09:55，恬竹 ***@***.***> 写道：
@SunShinewyf commented on this pull request.
In progressive/step2/app/router.js:
> @@ -1,5 +1,6 @@
'use strict';
module.exports = app => {
- app.router.get('/', app.controller.home.isIOS);
+ const {router,controller} = app;
这个是eslint的原因，没控制好代码格式，“把fixture干掉”是什么意思，删掉fixture这个目录？
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub, or mute the thread.
|
atian25
approved these changes
Dec 10, 2017
progressive/step1/test/index.test.js
Outdated
| return app.ready(); | ||
| }); | ||
|
|
||
| after(() => app.close()); | ||
| afterEach(mock.restore); |
There was a problem hiding this comment.
afterEach 也是不需要的，可以看看 bootstrap 里面做了啥
.travis.yml
Outdated
| @@ -3,10 +3,10 @@ language: node_js | |||
| node_js: | |||
| - '8' | |||
| services: | |||
| - postgresql | |||
|
|
||
| describe('test/framework.test.js', () => { | ||
| let app; | ||
|
|
||
| before(() => { | ||
| app = mm.app({ | ||
| app = mock.app({ | ||
| baseDir: 'test-app', | ||
| customEgg: true, |
atian25
approved these changes
Dec 10, 2017
|
ci 挂了，少了 config.keys |
popomore
reviewed
Dec 11, 2017
progressive/step1/package.json
Outdated
| @@ -7,11 +7,14 @@ | |||
| }, | |||
| "devDependencies": { | |||
| "egg-bin": "^4.3.5", | |||
| "egg-mock": "^3.13.1" | |||
| "egg-mock": "^3.13.1", | |||
| "autod": "^3.0.1", | |||
atian25
approved these changes
Dec 11, 2017
progressive/step1/package.json
Outdated
| @@ -3,7 +3,7 @@ | |||
| "version": "1.0.0", | |||
| "private": true, | |||
| "dependencies": { | |||
| "egg": "^1.10.1" | |||
| "egg": "^2.0.0" | |||
atian25
approved these changes
Dec 11, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.