chore: upgrade deps and fix test

eggjs · Feb 7, 2017 · 128d58e · 128d58e
1 parent 21069a3
commit 128d58e
Show file tree

Hide file tree

Showing 20 changed files with 129 additions and 134 deletions.
diff --git a/.autod.conf.js b/.autod.conf.js
@@ -8,13 +8,13 @@ module.exports = {
      'benchmark',
    ],
   devdep: [
+    'autod',
+    'egg',
     'egg-ci',
     'egg-bin',
-    'autod',
     'eslint',
     'eslint-config-egg',
     'supertest',
-    'should',
   ],
   exclude: [
     './test/fixtures',

diff --git a/.eslintignore b/.eslintignore
@@ -1,2 +1,2 @@
-test/fixtures
 coverage
+node_modules
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,16 @@
 sudo: false
 language: node_js
 node_js:
-  - '4'
-  - '6'
+- '6'
+- '7'
 install:
-  - npm i npminstall && npminstall
+- npm i npminstall && npminstall
 script:
-  - npm run ci
+- npm run ci
 after_script:
-  - npminstall codecov && codecov
+- npminstall codecov && codecov
 env:
   global:
-    - secure: Ws1h7ZU97/2npejMZp3/Jac0ZYkgXBW5gEilR5WrnkdkEbIhhK6HamrcqLrA6qCPV0Ax9nNbZCRJcQwPsTdOxBekJ3+3zflMWevfa9+CRS1Hh0mMcn+D864CjrRiQRgIQa8ZoFVPLaL/7qyQp1i7gLbPcpMjO6CA7LgV1reaf+U=
-    - secure: Sj56ZeEZ48Sms7+jEI0qvrtEZoGc5ywotxYxvZ3EHg42Xpv6HBE6aEl3AZhz8ggQgmtJ/AneWLAZGOnZHpQiVrMetUa46HcAzCJ0h/wJXechpyu/KRTqaDjHkn3lD0yi+WnvBTYUIBr+Db8VwLbbcRVM2h/GxgBnWBTaE6jlmag=
-    - secure: WixkbIJUiMfk4YZ+6Unlya1zxBl0i8X90O6xjd+gGogTf2IHeNUM8alLAMe9uFajbQnej8vKI+Lx9DTfaICtEoacjuG0UX8udZgMMyGxwBc36FJbUxeTtXpXp/PIz0rjmEGdIlFrjReMFcPjgOvyPdSNtUXYPACfGQFEhy69nJM=
-    - secure: PADJkH7wZP4vfIhvobEW66vmqQuIu6LZH2fcQ+aFRPiOCLU18jRiyKIMzAT9+igQTS5/nLGOJP1O94rD0wXpf7A07fK3DUYOGvC/kzD/Gdh/EkcjeyrL/EX7vITeVZJIxlUVE/F5WHDs04Xpezi4DlsE0v1WBj/Im+JKR7yyoZA=
-    - secure: A5B0GOXgKRNLc1+EAISSpxZeD9ZlPHJlv1vGUMXWv9qiR9KnZofh1GZYDbVKgOdbfPKSWgvb9vp8m1WPebOj8q/rT+DyfqRuKhqhQ2AudP2AcOBOATaOvLIMFrh4E+qdcvFq65A+nhg0b6EkINQjxrRyts/6gaAnQbshrYbElsc=
-    - secure: bf2G/bsk8+7xBU3zVF47/U5+kfpcyBv14dNkiQzax9r9fyhUlyKSyDsoWbGKijWYYmp9vjQlo9ymhmnRP5+zKho9XhJ5qteZmElCtQkwvAmKVIeZPbTcYA+ofagU2WCggF4k3R/YtXRX8P+Ie/+ge1dhq4YX1fmbDWXalRdhO7M=
-    - secure: F8d9Ix7IlWTA0XcxgxTlqzyIBkGJ0fT2YAa3GbpknU4KfrgK5rTzWNmN8N7Q2acxArjFRp2pYjFL/RlL8pI2skvj1HDK3FTABQh0cyBShhiuQLgm0xUSC3JSltpPBF4wEoC6Pdjd9oF1moc900A4g+pjCf/fx7vYm5GxnyHTKHI=
-    - secure: Og1xl8+NoUfc3ZlWT/yVOPy/8YhRHVNT2M+LVZ81iRwJNBxwm1cj40cck41Py2eG3AwH0yCj0K3u+o74fOHbTuYLzNskB1gYbA8m6v2vuMnGRblb6+UYEm3yUcYHJ4VXFMmFTMKyNoe/iqEpetgoKffbCAk3Xa7kZbbQR7T03tI=
+  - secure: TZP1CdTW0NSpxaiqCWtA8dKyNCtHR/MuZGINa3C0jmWMzrUtsHeDynktS2x9ByuUjR/CPDxXsizkRtw8s1gwDYquzD+ybmWjbsSyUvU1GGGwVarOout1d3hgWvqRQiicMpG+mQTcTz4BaknEwulTz3SXM8hg5BAJz7Hcmcp2hb8FPI7el8truYZFCFP0egEftzCYfsRc6EtS8flRe+sDF+ykmogvz/Y0P0O6UXlOFzb4vYMNxBxB85AVO7htThGIVOh+g0uicBz6k9rXOGsTAbM8lAhbp50LWB95cn+ANrkpRVQUULyobE8MdB+fZfFE5+ZYXYyMmorAvVZ7fGMG1TtPv/SgAj86sUIQ/tKvQS9gllEh45FFE3sclzpTJv7GFEvjQ7dxn6UFgqq3SVt7RCdx6bpNF8cbYaeWdLjmhElaciqbEJBXVGCZ9mBlwaAY+GUqhbppk7GhKfaAiySiVeOHalGokPFvKZAxY1W2lRenRsH5g22FvpgbS1FFcX0Bw2tId+Z2NFS6v4brGIC0ALN/ZkhVBC7AXUPajHtOm7QrZqWylzqogXdi/Jt5QUiO/Ed+Rfm2DfMbcIW0EBosO7jzx6tT2mZPnr1LIH6hJPyaGFHubvP0K0O2+lqRhukrXGCbUiU9/9Y25slMbsWrwRjR994OxY5BlaPCiTaSx6M=
+  - secure: p6nl25+IVA3GaQsR7rTPzJm1HH3ZJPH1Z70xlqHLi2kDG6UHRRuqy7s5+HnQXTzYuSYACXfIc/6MTgXzMeu05nrvk8wqufMImUHIQP4GGJxRWxd0ovihkO45mXu8UxnIXNI/VLHDv0mDQdtvOeO8h7Sj/ubraFgcuI1ZshnJoTrFgNRxVL0K2JgGQ4kAuU6Cn2zde3f+lIlNKL3AaQuMVYwVWsDhV/BxOA8vd/GjGPuQFoCqEf7Zaivj+BOIkDft5NhtBQX64KAMgK+DJDd7+dKpnAKVPsqDdhNUuWnqH+/g+LtJyU1oXguAnG1R58wkrbcdcbr49C8ctmKx96mVirs8VHvlIMj7Z5NT8/dQ6xD0mX2znfs5DnSq5y7Vw6aabFDoUmmRZ9Q/7H4LahCKApTFGUfjnAQioykjnSD+wAF07DDbBeW1eycwB9D5WXLKFnlvg5XUZ2iV8nFqf2ii7VvBo7Q91/INzzOGxCdlOk+u8qvPIonW92hBEqKSnRxca+HpgWiihO0QdqAe1ecpbMjwENuiznSX1oWfYPDlv+qpHLCmSSqdYdWLrUdsTWI74Lj7L1T0ZrP1RmE8eoboik3+cocrruNNK1sDuhN/0pA3l7bGeoZTf93QeTgUJV7lhbjEt6Q36DlHO13TQfl4Q8+16pZZci0/YOgfE6liTMs=
+  - secure: Cd/o5IFqws8ksdMRaBTUdht8ggS8oetDMQzMTO9sqJ5yymBazN/kZp9L08o54Xx7gQdG1vKopXgnUEpuoxugckCc+SZJSwQhnDa2coYkQgH5I3mqkoqb3cVhuRkv6T3GsI8i+Sr0yR4vLjhRYsokiAWFqZLAhHoWe3o96N02YVZ8oLCJm1M1/vhJFiK7/oYQLFAMVs8uCllouH2eenb//9uv9KdoFuoiazrnCB9tr096zMR2U/aCn/pibC3xwlvrLWT/p+PWYblaFV/uPOaiW4vwzA+M2A7JpN5KGZ2dm1C8/Bv1+YIBU/lamPnZVHq0nyIRd3yNkmLOB6p8nhxLJSszFU55l3radcV0l7T+Oy3uTz5QY316i0IvAVs387KnrW12tSz40k1dRZNTLq7l0e6/idnQ75bTREtjfk8DKKn51Sv0bLlar6Ixz/p7/MPzEt1PO40NsL9I7zoJMUBiWWdgn9PpxUgnsdXcq16p1tB+KqLZk2dz2rqIqUHm0v8JYpKvocNnXhCOkfp7i0gJfmUqfS89HQJZG4VmUQBmFu+Le/VliYcjH7mPCKUqYhGwYf1lrURcUWl1UDhvN7cwNGfi5vkCdGzTC9KTG46cfxnR+c/ztTwLPg81xkWowfayY0cqXHzgOAcIeEBFMBPv9PmFlnQCIiyYCNuWCe12jYs=
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 environment:
   matrix:
-    - nodejs_version: '4'
     - nodejs_version: '6'
+    - nodejs_version: '7'
 
 install:
   - ps: Install-Product node $env:nodejs_version

diff --git a/package.json b/package.json
@@ -7,40 +7,39 @@
   },
   "keywords": [
     "egg",
-    "plugin"
+    "egg-plugin",
+    "eggPlugin"
   ],
   "dependencies": {
-    "ali-oss": "~4.4.4",
-    "is-type-of": "~1.0.0"
+    "ali-oss": "^4.8.0"
   },
   "devDependencies": {
-    "ali-oss": "^4.4.4",
-    "autod": "^2",
+    "autod": "^2.7.1",
     "co": "^4.6.0",
-    "egg": "~0.1.3",
-    "egg-bin": "^1",
-    "egg-ci": "^1",
-    "egg-mock": "^0.0.4",
-    "eslint": "^3",
-    "eslint-config-egg": "^3",
-    "pedding": "~1.0.0",
-    "should": "^8",
-    "supertest": "^1",
-    "urllib": "~2.13.0"
+    "egg": "^0.9.0",
+    "egg-bin": "^2.0.2",
+    "egg-ci": "^1.1.0",
+    "egg-mock": "^2.3.1",
+    "eslint": "^3.14.1",
+    "eslint-config-egg": "^3.2.0",
+    "is-type-of": "^1.0.0",
+    "pedding": "^1.1.0",
+    "supertest": "^3.0.0",
+    "urllib": "2"
   },
   "engines": {
-    "node": ">=4.0.0"
+    "node": ">=6.0.0"
   },
   "scripts": {
-    "test": "npm run lint && npm run test-local",
-    "test-local": "egg-bin test -r should",
+    "autod": "autod",
+    "lint": "eslint .",
+    "test": "npm run lint -- --fix && npm run test-local",
+    "test-local": "egg-bin test",
     "cov": "egg-bin cov",
-    "lint": "eslint --ext js . --fix",
-    "ci": "npm run lint && npm run cov",
-    "autod": "autod"
+    "ci": "npm run lint && npm run cov"
   },
   "ci": {
-    "version": "4, 6"
+    "version": "6, 7"
   },
   "repository": {
     "type": "git",

diff --git a/test/fixtures/apps/oss-agent/agent.js b/test/fixtures/apps/oss-agent/agent.js
@@ -5,7 +5,7 @@ const fs = require('fs');
 
 module.exports = agent => {
   agent.messenger.on('oss start', () => {
-    co.call(agent, function*() {
+    co.call(agent, function* () {
       const name = 'chair-oss-test-upload-' + process.version + '-' + Date.now();
       yield this.oss.put(name, fs.createReadStream(__filename));
       this.messenger.broadcast('oss done');

diff --git a/test/fixtures/apps/oss-agent/app/router.js b/test/fixtures/apps/oss-agent/app/router.js
@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = app => {
-  app.get('/agent', function*() {
+  app.get('/agent', function* () {
     yield wrapPromise(app);
     this.body = 'OK';
   });

diff --git a/test/fixtures/apps/oss-agent/config/config.default.js b/test/fixtures/apps/oss-agent/config/config.default.js
@@ -1,13 +1,13 @@
 'use strict';
 
-let env = process.env;
+const env = process.env;
 
 exports.oss = {
-	client: {
-		accessKeyId: env.ALI_SDK_OSS_ID,
-		accessKeySecret: env.ALI_SDK_OSS_SECRET,
-		endpoint: env.ALI_SDK_OSS_ENDPOINT,
-		bucket: 'ali-oss-test-bucket-test99',
-	},
-	useAgent: true,
-};
+  client: {
+    accessKeyId: env.ALI_SDK_OSS_ID,
+    accessKeySecret: env.ALI_SDK_OSS_SECRET,
+    endpoint: env.ALI_SDK_OSS_ENDPOINT,
+    bucket: 'egg-oss-test-bucket-test99',
+  },
+  useAgent: true,
+};
diff --git a/test/fixtures/apps/oss-clients/app/router.js b/test/fixtures/apps/oss-clients/app/router.js
@@ -3,7 +3,7 @@
 const fs = require('fs');
 
 module.exports = function(app) {
-  app.get('/uploadtest', function*() {
+  app.get('/uploadtest', function* () {
     const name = 'oss-test-upload-' + process.version + '-' + Date.now();
     this.body = yield this.oss.get('oss2').put(name, fs.createReadStream(__filename));
   });

diff --git a/test/fixtures/apps/oss-clients/config/config.default.js b/test/fixtures/apps/oss-clients/config/config.default.js
@@ -1,6 +1,6 @@
 'use strict';
 
-let env = process.env;
+const env = process.env;
 
 exports.oss = {
   clients: {
@@ -16,6 +16,6 @@ exports.oss = {
 
   default: {
     endpoint: env.ALI_SDK_OSS_ENDPOINT,
-    bucket:'ali-oss-test-bucket-test99'
+    bucket: 'egg-oss-test-bucket-test99',
   },
 };
diff --git a/test/fixtures/apps/oss-cluster/app/router.js b/test/fixtures/apps/oss-cluster/app/router.js
@@ -5,25 +5,25 @@ const fs = require('fs');
 const is = require('is-type-of');
 
 module.exports = function(app) {
-  app.get('/', function*() {
+  app.get('/', function* () {
     this.body = {
       app: is.object(this.app.oss),
       ctx: is.object(this.oss),
-      putBucket: is.generatorFunction(this.oss.putBucket)
-    }
+      putBucket: is.generatorFunction(this.oss.putBucket),
+    };
   });
 
-  app.get('/uploadtest', function*() {
+  app.get('/uploadtest', function* () {
     const name = 'oss-test-upload-' + process.version + '-' + Date.now();
     this.body = yield this.oss.put(name, fs.createReadStream(__filename));
   });
 
-  app.get('/upload', function*() {
+  app.get('/upload', function* () {
     this.set('x-csrf', this.csrf);
     yield this.render('upload.html');
   });
 
-  app.post('/upload', function*() {
+  app.post('/upload', function* () {
     const stream = yield this.getFileStream();
     const name = 'multipart-test/' + process.version + '-' + Date.now() + '-' + path.basename(stream.filename);
     // 文件处理，上传到云存储等等
@@ -35,4 +35,4 @@ module.exports = function(app) {
       fields: stream.fields,
     };
   });
-};
+};
diff --git a/test/fixtures/apps/oss-cluster/config/config.default.js b/test/fixtures/apps/oss-cluster/config/config.default.js
@@ -1,19 +1,19 @@
 'use strict';
 
-let env = process.env;
+const env = process.env;
 
 exports.oss = {
   client: {
     cluster: [{
       accessKeyId: env.ALI_SDK_OSS_ID,
       accessKeySecret: env.ALI_SDK_OSS_SECRET,
       endpoint: env.ALI_SDK_OSS_ENDPOINT,
-      bucket: 'ali-oss-test-bucket-test99'
+      bucket: 'egg-oss-test-bucket-test99',
     }, {
       accessKeyId: env.ALI_SDK_OSS_ID,
       accessKeySecret: env.ALI_SDK_OSS_SECRET,
       endpoint: env.ALI_SDK_OSS_ENDPOINT,
-      bucket: 'ali-oss-test-bucket-test99'
-    }]
-  }
-};
+      bucket: 'egg-oss-test-bucket-test99',
+    }],
+  },
+};
diff --git a/test/fixtures/apps/oss-endpoint-http/app/router.js b/test/fixtures/apps/oss-endpoint-http/app/router.js
@@ -5,25 +5,25 @@ const fs = require('fs');
 const is = require('is-type-of');
 
 module.exports = function(app) {
-  app.get('/', function*() {
+  app.get('/', function* () {
     this.body = {
       app: is.object(this.app.oss),
       ctx: is.object(this.oss),
-      putBucket: is.generatorFunction(this.oss.putBucket)
-    }
+      putBucket: is.generatorFunction(this.oss.putBucket),
+    };
   });
 
-  app.get('/uploadtest', function*() {
+  app.get('/uploadtest', function* () {
     const name = 'oss-test-upload-' + process.version + '-' + Date.now();
     this.body = yield this.oss.put(name, fs.createReadStream(__filename));
   });
 
-  app.get('/upload', function*() {
+  app.get('/upload', function* () {
     this.set('x-csrf', this.csrf);
     yield this.render('upload.html');
   });
 
-  app.post('/upload', function*() {
+  app.post('/upload', function* () {
     const stream = yield this.getFileStream();
     const name = 'multipart-test/' + process.version + '-' + Date.now() + '-' + path.basename(stream.filename);
     // 文件处理，上传到云存储等等

diff --git a/test/fixtures/apps/oss-endpoint-http/config/config.default.js b/test/fixtures/apps/oss-endpoint-http/config/config.default.js
@@ -1,12 +1,12 @@
 'use strict';
 
-let env = process.env;
+const env = process.env;
 
 exports.oss = {
-	client: {
-		accessKeyId: env.ALI_SDK_OSS_ID,
-		accessKeySecret: env.ALI_SDK_OSS_SECRET,
-		endpoint: env.ALI_SDK_OSS_ENDPOINT,
-  		bucket:'ali-oss-test-bucket-test99'
-	}
-};
+  client: {
+    accessKeyId: env.ALI_SDK_OSS_ID,
+    accessKeySecret: env.ALI_SDK_OSS_SECRET,
+    endpoint: env.ALI_SDK_OSS_ENDPOINT,
+    bucket: 'egg-oss-test-bucket-test99',
+  },
+};
diff --git a/test/fixtures/apps/oss-missing-config/config/config.default.js b/test/fixtures/apps/oss-missing-config/config/config.default.js
@@ -1,11 +1,11 @@
 'use strict';
 
-let env = process.env;
+const env = process.env;
 
 exports.oss = {
-	client: {
-		accessKeyId: env.ALI_SDK_OSS_ID,
-		endpoint: env.ALI_SDK_OSS_ENDPOINT,
-  		bucket:'ali-oss-test-bucket-test99'
-	}
-};
+  client: {
+    accessKeyId: env.ALI_SDK_OSS_ID,
+    endpoint: env.ALI_SDK_OSS_ENDPOINT,
+    bucket: 'egg-oss-test-bucket-test99',
+  },
+};
diff --git a/test/fixtures/apps/oss-not-init/app/router.js b/test/fixtures/apps/oss-not-init/app/router.js
@@ -5,25 +5,25 @@ const fs = require('fs');
 const is = require('is-type-of');
 
 module.exports = function(app) {
-  app.get('/', function*() {
+  app.get('/', function* () {
     this.body = {
       app: is.object(this.app.oss),
       ctx: is.object(this.app.uploader),
-      putBucket: is.generatorFunction(this.app.uploader.putBucket)
-    }
+      putBucket: is.generatorFunction(this.app.uploader.putBucket),
+    };
   });
 
-  app.get('/uploadtest', function*() {
+  app.get('/uploadtest', function* () {
     const name = 'chair-oss-test-upload-' + process.version + '-' + Date.now();
     this.body = yield this.app.uploader.put(name, fs.createReadStream(__filename));
   });
 
-  app.get('/upload', function*() {
+  app.get('/upload', function* () {
     this.set('x-csrf', this.csrf);
     yield this.render('upload.html');
   });
 
-  app.post('/upload', function*() {
+  app.post('/upload', function* () {
     const stream = yield this.getFileStream();
     const name = 'chair-multipart-test/' + process.version + '-' + Date.now() + '-' + path.basename(stream.filename);
     // 文件处理，上传到云存储等等

diff --git a/test/fixtures/apps/oss-not-init/config/config.default.js b/test/fixtures/apps/oss-not-init/config/config.default.js
@@ -1,14 +1,14 @@
 'use strict';
 
-let env = process.env;
+const env = process.env;
 
 exports.uploader = {
-	accessKeyId: env.ALI_SDK_OSS_ID,
-	accessKeySecret: env.ALI_SDK_OSS_SECRET,
-	endpoint: env.ALI_SDK_OSS_ENDPOINT,
-  	bucket:'ali-oss-test-bucket-test99'
+  accessKeyId: env.ALI_SDK_OSS_ID,
+  accessKeySecret: env.ALI_SDK_OSS_SECRET,
+  endpoint: env.ALI_SDK_OSS_ENDPOINT,
+  bucket: 'egg-oss-test-bucket-test99',
 };
 
 exports.oss = {
-	init: false,
-};
+  init: false,
+};