split unittest/integration test cases

Author: JacksonTian

.travis.yml

@@ -4,5 +4,10 @@ node_js:
   - "10"
   - "8"
 
+branches:
+  only:
+    - master
+
 script:
   - npm run ci
+  - test -z $ACCESS_KEY_ID -a -z $ACCESS_KEY_SECRET || npm run test-integration

lib/rpc.js

@@ -179,7 +179,7 @@ class RPCClient {
     if (opts.method === 'POST') {
       opts.headers = {};
       opts.headers['content-type'] = 'application/x-www-form-urlencoded';
-      opts.data = canonicalize(normalized)
+      opts.data = canonicalize(normalized);
     }
 
     return httpx.request(url, opts).then((response) => {

package.json

@@ -8,6 +8,7 @@
     "lint": "eslint --fix lib test",
     "test": "mocha -R spec test/*.test.js",
     "test-cov": "nyc -r=html -r=text -r=lcov mocha -t 3000 -R spec test/*.test.js",
+    "test-integration": "mocha -R spec test/*.integration.js",
     "ci": "npm run lint && npm run test-cov && codecov"
   },
   "keywords": [

test/roa.integration.js

@@ -0,0 +1,40 @@
+'use strict';
+
+const expect = require('expect.js');
+
+const ROAClient = require('../lib/roa');
+
+describe('request', function () {
+  var client = new ROAClient({
+    accessKeyId: process.env.ACCESS_KEY_ID,
+    accessKeySecret: process.env.ACCESS_KEY_SECRET,
+    endpoint: 'http://ros.aliyuncs.com',
+    apiVersion: '2015-09-01'
+  });
+
+  it('request', async function () {
+    this.timeout(15000);
+    var result = await client.request('GET', '/regions', {}, '', {}, {
+      timeout: 15000
+    });
+    expect(result).to.have.property('Regions');
+  });
+
+  it('get should ok', async function () {
+    this.timeout(10000);
+    var result = await client.get('/regions', {}, {}, {
+      timeout: 10000
+    });
+    expect(result).to.have.property('Regions');
+  });
+
+  it('get raw body should ok', async function () {
+    this.timeout(10000);
+    var opts = {
+      rawBody: true,
+      timeout: 10000
+    };
+    var result = await client.get('/regions', {}, {}, opts);
+    expect(result).to.be.a('string');
+  });
+});

test/roa.test.js

@@ -106,39 +106,4 @@ describe('roa core', function() {
       });
     });
   });
-
-  describe('request', function () {
-    var client = new ROAClient({
-      accessKeyId: process.env.ACCESS_KEY_ID,
-      accessKeySecret: process.env.ACCESS_KEY_SECRET,
-      endpoint: 'http://ros.aliyuncs.com',
-      apiVersion: '2015-09-01'
-    });
-
-    it('request', async function () {
-      this.timeout(10000);
-      var result = await client.request('GET', '/regions', {}, '', {}, {
-        timeout: 10000
-      });
-      expect(result).to.have.property('Regions');
-    });
-
-    it('get should ok', async function () {
-      this.timeout(10000);
-      var result = await client.get('/regions', {}, {}, {
-        timeout: 10000
-      });
-      expect(result).to.have.property('Regions');
-    });
-
-    it('get raw body should ok', async function () {
-      this.timeout(10000);
-      var opts = {
-        rawBody: true,
-        timeout: 10000
-      };
-      var result = await client.get('/regions', {}, {}, opts);
-      expect(result).to.be.a('string');
-    });
-  });
 });

test/rpc.integration.js

@@ -0,0 +1,49 @@
+'use strict';
+
+const expect = require('expect.js');
+
+const RPCClient = require('../lib/rpc');
+
+describe('request', function() {
+  var client = new RPCClient({
+    accessKeyId: process.env.ACCESS_KEY_ID,
+    accessKeySecret: process.env.ACCESS_KEY_SECRET,
+    endpoint: 'https://ecs.aliyuncs.com',
+    apiVersion: '2014-05-26'
+  });
+
+  it('should ok', async function() {
+    this.timeout(15000);
+
+    var params = {
+      key: ['1', '2', '3', '4', '5', '6', '7', '8', '9',
+        '10', '11']
+    };
+
+    var requestOption = {
+      method: 'POST',
+      timeout: 15000
+    };
+
+    const result = await client.request('DescribeRegions', params, requestOption);
+    expect(result).to.have.key('RequestId');
+    expect(result).to.have.key('Regions');
+  });
+
+  it('should ok with repeat list less 10 item', async function() {
+    this.timeout(15000);
+
+    var params = {
+      key: ['1', '2', '3', '4', '5', '6', '7', '8', '9']
+    };
+
+    var requestOption = {
+      method: 'POST',
+      timeout: 15000
+    };
+
+    const result = await client.request('DescribeRegions', params, requestOption);
+    expect(result).to.have.key('RequestId');
+    expect(result).to.have.key('Regions');
+  });
+});

test/rpc.test.js

@@ -172,50 +172,5 @@ describe('rpc core', function() {
         ['c', 'value']
       ])).to.be('a=value&b=value&c=value');
     });
-
-  });
-
-  describe('request', function() {
-    var client = new RPCClient({
-      accessKeyId: process.env.ACCESS_KEY_ID,
-      accessKeySecret: process.env.ACCESS_KEY_SECRET,
-      endpoint: 'https://ecs.aliyuncs.com',
-      apiVersion: '2014-05-26'
-    });
-
-    it('should ok', async function() {
-      this.timeout(10000);
-
-      var params = {
-        key: ['1', '2', '3', '4', '5', '6', '7', '8', '9',
-          '10', '11']
-      };
-
-      var requestOption = {
-        method: 'POST',
-        timeout: 10000
-      };
-
-      const result = await client.request('DescribeRegions', params, requestOption);
-      expect(result).to.have.key('RequestId');
-      expect(result).to.have.key('Regions');
-    });
-
-    it('should ok with repeat list less 10 item', async function() {
-      this.timeout(10000);
-
-      var params = {
-        key: ['1', '2', '3', '4', '5', '6', '7', '8', '9']
-      };
-
-      var requestOption = {
-        method: 'POST',
-        timeout: 10000
-      };
-
-      const result = await client.request('DescribeRegions', params, requestOption);
-      expect(result).to.have.key('RequestId');
-      expect(result).to.have.key('Regions');
-    });
   });
 });