🔨 Rewrite tests

Author: jysperm

.jshintrc

@@ -1,10 +1,10 @@
 language: node_js
 
 node_js:
-  - 0.12
   - 4
   - 6
+  - node
 
 script:
   - npm test
-  - node -v | grep 'v0.12' || npm run test-koa
+  - npm run test-koa

.travis.yml

@@ -2,9 +2,10 @@
 
 ## v2.0.0
 
-* **存在不兼容改动** 升级 JavaScript SDK 到 [leancloud-storage 2.1.0](https://github.com/leancloud/javascript-sdk/releases/tag/v2.0.0)
-* **不兼容改动** 仅兼容至 Node.js 4.3 以上版本
-* **不兼容** 移除 `AV.Cloud.httpRequest`
+* **不兼容改动** 升级 JavaScript SDK 到 [leancloud-storage 2.1.0](https://github.com/leancloud/javascript-sdk/releases/tag/v2.0.0)
+* **不兼容改动** 仅兼容至 Node.js 4.4 以上版本
+* **不兼容改动** 重复定义云函数或 Hook 时会抛出一个异常
+* **不兼容改动** 移除 `AV.Cloud.httpRequest`
 
 ## v1.2.3
 

CHANGELOG.md

@@ -33,7 +33,7 @@
     }
   },
   "engines": {
-    "node": ">=4.3.0"
+    "node": ">=4.4.0"
   },
   "license": "MIT",
   "author": {

package.json

@@ -1,28 +1,18 @@
 'use strict';
-var config = require('./config'),
-  AV = require('..');
 
-var appId = config.appId;
-var appKey = config.appKey;
-var masterKey = config.masterKey;
-
-AV.init(config);
+var request = require('supertest');
 
-var app;
+const AV = require('..');
+const utils = require('./utils')
+const appInfo = require('./utils/app-info');
 
-if (process.env.FRAMEWORK == 'koa') {
-  var koa = require('koa')();
-  koa.use(AV.koa());
-  app = koa.listen();
-} else {
-  app = AV.express();
-}
+require('./utils/functions');
 
-AV.Cloud.define('foo', function(request, response) {
-  response.success("bar");
-});
+var appId = appInfo.appId;
+var appKey = appInfo.appKey;
+var masterKey = appInfo.masterKey;
 
-var request = require('supertest');
+const app = utils.app();
 
 describe('authorization', function() {
   it('ok', function(done) {

test/authorization_test.js test/authorization-test.jstest/authorization_test.js renamed to test/authorization-test.js

@@ -5,13 +5,11 @@ var bodyParser = require('body-parser');
 var request = require('supertest');
 var should = require('should');
 
-var AV = require('..');
-var config = require('./config');
+const AV = require('..');
+const appInfo = require('./utils/app-info');
 
 var app = express();
 
-AV.init(config);
-
 app.use(AV.express());
 app.use(bodyParser.json());
 app.use(AV.Cloud.CookieSession({secret: 'my secret', maxAge: 3600000, fetchUser: true}));
@@ -42,7 +40,7 @@ app.get('/profile', function(req, res) {
   res.send(req.currentUser);
 });
 
-describe('webhosting', function() {
+describe('cookie-session', function() {
   it('index', function(done) {
     request(app).get('/')
     .expect(200, function(err, res) {
@@ -53,6 +51,8 @@ describe('webhosting', function() {
   });
 
   it('loign', function(done) {
+    this.timeout(20000);
+
     request(app).post('/login')
     .send({
       username: 'admin',

test/cookie-session-test.js

@@ -5,15 +5,13 @@ var assert = require('assert');
 var bodyParser = require('body-parser');
 
 var AV = require('..');
-var config = require('./config');
+const appInfo = require('./utils/app-info');
 var request = require('supertest');
 
-var appId = config.appId;
-var appKey = config.appKey;
-var masterKey = config.masterKey;
-var sessionTokenAdmin = config.sessionToken_admin;
-
-AV.init(config);
+var appId = appInfo.appId;
+var appKey = appInfo.appKey;
+var masterKey = appInfo.masterKey;
+var sessionTokenAdmin = appInfo.sessionTokenAdmin;
 
 describe('current user', function() {
   var app = express();