feat: [BREAKING_CHANGE] use egg-core

.autod.conf.js

@@ -7,6 +7,7 @@ module.exports = {
   devprefix: '^',
   exclude: [
     'test/fixtures',
+    'examples',
   ],
   devdep: [
     'autod',

config/plugin.js

@@ -31,7 +31,7 @@ module.exports = {
    * @since 1.0.0
    */
   userrole: {
-    enable: false,
+    enable: true,
     package: 'egg-userrole',
   },
 
@@ -53,7 +53,7 @@ module.exports = {
    * @since 1.0.0
    */
   i18n: {
-    enable: false,
+    enable: true,
     package: 'egg-i18n',
   },
 
@@ -130,7 +130,7 @@ module.exports = {
    * @since 2.7.0
    */
   schedule: {
-    enable: false,
+    enable: true,
     package: 'egg-schedule',
   },
 

examples/cookie/test/index.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const mm = require('egg-mock');
 
 describe('example cookie test', () => {

examples/cookie_session/test/index.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const mm = require('egg-mock');
 
 describe('example cookie_session test', () => {

examples/helloworld/test/index.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const mm = require('egg-mock');
 
 describe('example helloworld test', () => {

examples/multipart/test/index.test.js

@@ -2,7 +2,7 @@
 
 const assert = require('assert');
 const path = require('path');
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const mm = require('egg-mock');
 const formstream = require('formstream');
 const urllib = require('urllib');

examples/static/test/index.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const mm = require('egg-mock');
 
 describe('example static test', () => {

package.json

@@ -1,75 +1,68 @@
 {
   "name": "egg",
-  "version": "0.1.0-beta.2",
+  "version": "0.1.0-beta.3",
   "description": "A web framework's framework for Node.js",
   "dependencies": {
     "accepts": "^1.3.3",
-    "agentkeepalive": "^2.1.1",
+    "agentkeepalive": "^2.2.0",
     "co": "^4.6.0",
     "debug": "^2.2.0",
     "delegates": "^1.0.0",
-    "depd": "^1.1.0",
-    "egg-cluster": "~0.1.0",
+    "egg-cluster": "^0.1.0",
     "egg-cookies": "^1.0.0",
-    "egg-cors": "*",
-    "egg-development": "*",
-    "egg-i18n": "^1.0.0",
-    "egg-core": "~0.1.0",
-    "egg-logger": "^1.1.0",
-    "egg-logrotater": "^1.0.0",
+    "egg-core": "^0.1.0",
+    "egg-cors": "^0.0.2",
+    "egg-development": "^0.0.2",
+    "egg-i18n": "^1.0.1",
+    "egg-logger": "^1.2.0",
+    "egg-logrotater": "^1.0.1",
     "egg-multipart": "^1.0.0",
-    "egg-onerror": "*",
+    "egg-onerror": "^0.0.3",
     "egg-rest": "^1.0.0",
-    "egg-schedule": "^0.1.0",
-    "egg-security": "*",
-    "egg-session": "*",
+    "egg-schedule": "^2.0.0",
+    "egg-security": "^0.0.4",
+    "egg-session": "^0.0.2",
     "egg-static": "^0.1.0",
-    "egg-userrole": "*",
+    "egg-userrole": "^0.1.0",
     "egg-userservice": "^0.1.0",
-    "egg-validate": "*",
+    "egg-validate": "^0.0.2",
     "egg-watcher": "^1.0.0",
-    "graceful": "^1.0.0",
+    "graceful": "^1.0.1",
     "humanize-ms": "^1.2.0",
-    "inflection": "^1.10.0",
     "is-type-of": "^1.0.0",
     "jsonp-body": "^1.0.0",
-    "koa": "^1.2.0",
     "koa-bodyparser": "^2.2.0",
     "koa-override": "^1.0.0",
-    "koa-router": "^5.4.0",
-    "ready-callback": "^1.0.0",
     "scmp": "^1.0.0",
     "sdk-base": "^2.0.1",
     "sendmessage": "^1.0.5",
-    "urllib": "^2.9.1",
-    "utility": "^1.8.0"
+    "urllib": "^2.13.0"
   },
   "devDependencies": {
-    "autod": "^2.6.1",
+    "autod": "^2.7.0",
     "autod-egg": "^1.0.0",
     "beautify-benchmark": "^0.2.4",
     "benchmark": "^2.1.0",
     "co-sleep": "^0.0.1",
-    "coffee": "^3.2.2",
+    "coffee": "^3.2.4",
     "egg-bin": "1",
     "egg-ci": "1",
-    "egg-mock": "*",
+    "egg-mock": "^0.0.4",
     "egg-plugin-puml": "1",
     "eslint": "^3.0.0",
     "eslint-config-egg": "^3.1.0",
     "estraverse": "^4.1.1",
     "formstream": "^1.0.0",
-    "glob": "^7.0.3",
+    "glob": "^7.0.5",
     "merge-descriptors": "^1.0.1",
-    "moment": "^2.13.0",
+    "moment": "^2.14.1",
     "once": "^1.3.3",
     "pedding": "^1.0.0",
     "rds": "^0.1.0",
-    "rimraf": "^2.5.2",
-    "should": "^6.0.3",
+    "rimraf": "^2.5.4",
+    "should": "^11.1.0",
     "stream-wormhole": "^1.0.0",
-    "supertest": "^1.2.0",
-    "supertest-as-promised": "^3.2.0"
+    "supertest": "^2.0.0"
   },
   "main": "index.js",
   "files": [

test/lib/cluster/app_worker.test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const utils = require('../../utils');
 
 describe('test/lib/cluster/app_worker.test.js', () => {

test/lib/cluster/master.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const mm = require('egg-mock');
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const coffee = require('coffee');
 const utils = require('../../utils');
 

test/lib/core/agent_worker_client.test.js

@@ -2,7 +2,7 @@
 
 const should = require('should');
 const mm = require('egg-mock');
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const sleep = require('co-sleep');
 const path = require('path');
 const EventEmitter = require('events').EventEmitter;

test/lib/core/app/extend/application.test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const mm = require('egg-mock');
 const utils = require('../../../../utils');
 

test/lib/core/app/extend/context.jsonp.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const mm = require('egg-mock');
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const utils = require('../../../../utils');
 
 describe('test/lib/core/app/extend/context.jsonp.test.js', () => {

test/lib/core/app/extend/context.test.js

@@ -4,7 +4,7 @@ const should = require('should');
 const fs = require('fs');
 const path = require('path');
 const mm = require('egg-mock');
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const rimraf = require('rimraf');
 const utils = require('../../../../utils');
 

test/lib/core/app/extend/helper.test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const utils = require('../../../../utils');
 
 describe('test/lib/core/app/extend/helper.test.js', () => {

test/lib/core/app/middleware/meta.test.js

@@ -2,7 +2,7 @@
 
 const should = require('should');
 const mm = require('egg-mock');
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const utils = require('../../../../utils');
 
 describe('test/lib/core/app/middleware/meta.test.js', () => {

test/lib/core/app/middleware/override_method.test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const utils = require('../../../../utils');
 
 describe('test/lib/core/app/middleware/override_method.test.js', () => {

test/lib/core/app/middleware/site_file.test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const should = require('should');
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const utils = require('../../../../utils');
 
 describe('test/lib/core/app/middleware/site_file.test.js', () => {
@@ -46,7 +46,7 @@ describe('test/lib/core/app/middleware/site_file.test.js', () => {
   it('should support HEAD', () => {
     return request(app.callback())
       .head('/robots.txt')
-      .expect('content-length', 72)
+      .expect('content-length', '72')
       .expect('') // body must be empty for HEAD
       .expect(200);
   });

test/lib/core/cookies.test.js

@@ -2,7 +2,7 @@
 
 const should = require('should');
 const mm = require('egg-mock');
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const utils = require('../../utils');
 
 describe('test/lib/core/cookies.test.js', () => {

test/lib/core/loader/load_plugin.test.js

@@ -199,15 +199,15 @@ describe('test/lib/core/loader/load_plugin.test.js', () => {
     }).should.eql([
       'onerror',
       'userservice',
-      // 'userrole',
+      'userrole',
       'session',
-      // 'i18n',
+      'i18n',
       'validate',
       'watcher',
       'multipart',
       'security',
       'development',
-      // 'schedule',
+      'schedule',
       // 'logrotater',
       'b',
       'c1',

test/lib/core/loader/load_router.test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const pedding = require('pedding');
 const utils = require('../../../utils');
 

test/lib/core/messenger.test.js

@@ -150,10 +150,10 @@ describe('test/lib/core/messenger.test.js', () => {
 
     it('app should accept agent message', done => {
       setTimeout(() => {
-        count(app.stdout, 'agent2app').should.containEql(2);
-        count(app.stdout, 'app2app').should.containEql(4);
-        count(app.stdout, 'agent2agent').should.containEql(1);
-        count(app.stdout, 'app2agent').should.containEql(2);
+        count(app.stdout, 'agent2app').should.equal(2);
+        count(app.stdout, 'app2app').should.equal(4);
+        count(app.stdout, 'agent2agent').should.equal(1);
+        count(app.stdout, 'app2agent').should.equal(2);
         done();
       }, 500);
 

test/lib/core/router.test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const mm = require('egg-mock');
 const utils = require('../../utils');
 

test/lib/plugins/cors.test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const mm = require('egg-mock');
 const utils = require('../../utils');
 

test/lib/plugins/i18n.test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const utils = require('../../utils');
 
 describe.skip('test/lib/plugins/i18n.test.js', () => {

test/lib/plugins/onerror.test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const mm = require('egg-mock');
 const utils = require('../../utils');
 

test/lib/plugins/schedule.test.js

@@ -4,7 +4,7 @@ const path = require('path');
 const fs = require('fs');
 const utils = require('../../utils');
 
-describe.skip('test/lib/plugins/schedule.test.js', () => {
+describe('test/lib/plugins/schedule.test.js', () => {
   it('should schedule work', function* () {
     const app = utils.cluster('apps/schedule', {
       workers: 4,

test/lib/plugins/security.test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const utils = require('../../utils');
 
 describe('test/lib/plugins/security.test.js', () => {

test/lib/plugins/static.test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const utils = require('../../utils');
 
 describe('test/lib/plugins/static.test.js', () => {

test/lib/plugins/userrole.test.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const request = require('supertest-as-promised');
+const request = require('supertest');
 const utils = require('../../utils');
 
-describe.skip('test/lib/plugins/userrole.test.js', () => {
+describe('test/lib/plugins/userrole.test.js', () => {
   let app;
   before(() => {
     app = utils.app('apps/userrole');