Showing
8 changed files
with
32 additions
and
36 deletions
@@ -15,7 +15,7 @@ | @@ -15,7 +15,7 @@ | ||
15 | "lint-js": "./node_modules/.bin/eslint -c .eslintrc --cache --fix .", | 15 | "lint-js": "./node_modules/.bin/eslint -c .eslintrc --cache --fix .", |
16 | "lint-css": "./node_modules/.bin/stylelint --config .stylelintrc public/**/*.css", | 16 | "lint-css": "./node_modules/.bin/stylelint --config .stylelintrc public/**/*.css", |
17 | "precommit": "node lint.js", | 17 | "precommit": "node lint.js", |
18 | - "test": "ava" | 18 | + "test": "./node_modules/.bin/nyc ./node_modules/.bin/ava" |
19 | }, | 19 | }, |
20 | "ava": { | 20 | "ava": { |
21 | "tap": true, | 21 | "tap": true, |
@@ -41,12 +41,12 @@ | @@ -41,12 +41,12 @@ | ||
41 | "md5": "^2.1.0", | 41 | "md5": "^2.1.0", |
42 | "memcached": "^2.2.1", | 42 | "memcached": "^2.2.1", |
43 | "morgan": "^1.7.0", | 43 | "morgan": "^1.7.0", |
44 | + "nyc": "^6.4.3", | ||
44 | "oneapm": "^1.2.20", | 45 | "oneapm": "^1.2.20", |
45 | "request-promise": "^3.0.0", | 46 | "request-promise": "^3.0.0", |
46 | "serve-favicon": "^2.3.0", | 47 | "serve-favicon": "^2.3.0", |
47 | "winston": "^2.2.0", | 48 | "winston": "^2.2.0", |
48 | - "winston-daily-rotate-file": "^1.0.1", | ||
49 | - "yoho-handlebars": "0.0.1" | 49 | + "winston-daily-rotate-file": "^1.0.1" |
50 | }, | 50 | }, |
51 | "devDependencies": { | 51 | "devDependencies": { |
52 | "autoprefixer": "^6.3.6", | 52 | "autoprefixer": "^6.3.6", |
@@ -66,6 +66,8 @@ | @@ -66,6 +66,8 @@ | ||
66 | "husky": "^0.11.4", | 66 | "husky": "^0.11.4", |
67 | "mocha": "^2.4.5", | 67 | "mocha": "^2.4.5", |
68 | "nodemon": "1.9.2", | 68 | "nodemon": "1.9.2", |
69 | + "nyc": "^6.4.3", | ||
70 | + "yoho-handlebars": "0.0.1", | ||
69 | "postcss-assets": "^4.0.1", | 71 | "postcss-assets": "^4.0.1", |
70 | "postcss-cachebuster": "^0.1.2", | 72 | "postcss-cachebuster": "^0.1.2", |
71 | "postcss-calc": "^5.2.1", | 73 | "postcss-calc": "^5.2.1", |
@@ -79,7 +81,6 @@ | @@ -79,7 +81,6 @@ | ||
79 | "postcss-sprites": "^3.1.2", | 81 | "postcss-sprites": "^3.1.2", |
80 | "postcss-use": "^2.0.2", | 82 | "postcss-use": "^2.0.2", |
81 | "precss": "^1.4.0", | 83 | "precss": "^1.4.0", |
82 | - "rewire": "^2.5.1", | ||
83 | "shelljs": "^0.7.0", | 84 | "shelljs": "^0.7.0", |
84 | "stylelint": "^6.3.3", | 85 | "stylelint": "^6.3.3", |
85 | "stylelint-config-yoho": "^1.2.2", | 86 | "stylelint-config-yoho": "^1.2.2", |
1 | -// /** | ||
2 | -// * http api 测试 | ||
3 | -// * | ||
4 | -// * @author: jiangfeng<jeff.jiang@yoho.cn> | ||
5 | -// * @date: 2016/05/17 | ||
6 | -// */ | 1 | +/** |
2 | + * http api 测试 | ||
3 | + * | ||
4 | + * @author: jiangfeng<jeff.jiang@yoho.cn> | ||
5 | + * @date: 2016/05/17 | ||
6 | + */ | ||
7 | 7 | ||
8 | -// import test from 'ava'; | 8 | +const test = require('ava'); |
9 | +const sign = require('../../library/sign'); | ||
10 | +const API = require('../../library/api').ServiceAPI; | ||
9 | 11 | ||
10 | -// import {SearchAPI} from '../../library/api'; | 12 | +const api = new API(); |
11 | 13 | ||
12 | -// test('api get test', async (t) => { | ||
13 | -// let api = new SearchAPI(''); | ||
14 | -// let data = await api.get(); | ||
15 | -// console.log(data); | ||
16 | -// }); | 14 | +test('api get test', (t) => { |
15 | + return api.get('operations/api/v6/category/getCategory', sign.apiSign({})).then(result => { | ||
16 | + if (result && result.code === 200) { | ||
17 | + t.pass(); | ||
18 | + } else { | ||
19 | + t.fail(); | ||
20 | + } | ||
21 | + }); | ||
22 | +}); |
test/library/commonmodel.test.js
deleted
100644 → 0
1 | -const headerModel = require('../../doraemon/models/header'); | ||
2 | - | ||
3 | -const test = require('ava').test; | ||
4 | - | ||
5 | -test('test setNavHeader method', t => { | ||
6 | - const headerData = headerModel.setNavHeader('逛'); | ||
7 | - | ||
8 | - t.is(headerData.navTitle, '逛'); | ||
9 | - t.true(headerData.backUrl); | ||
10 | - t.true(headerData.navBtn); | ||
11 | -}); |
@@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
6 | 6 | ||
7 | 'use strict'; | 7 | 'use strict'; |
8 | 8 | ||
9 | -const test = require('ava').test; | 9 | +const test = require('ava'); |
10 | const helpers = require('../../library/helpers'); | 10 | const helpers = require('../../library/helpers'); |
11 | 11 | ||
12 | test('qiniu image url handle', t => { | 12 | test('qiniu image url handle', t => { |
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | * logger 工具类测试 | 2 | * logger 工具类测试 |
3 | */ | 3 | */ |
4 | 4 | ||
5 | -const test = require('ava').test; | 5 | +const test = require('ava'); |
6 | const shelljs = require('shelljs'); | 6 | const shelljs = require('shelljs'); |
7 | const logger = require('../../library/logger'); | 7 | const logger = require('../../library/logger'); |
8 | 8 | ||
@@ -23,7 +23,7 @@ const logger = require('../../library/logger'); | @@ -23,7 +23,7 @@ const logger = require('../../library/logger'); | ||
23 | // }; | 23 | // }; |
24 | 24 | ||
25 | test.cb('logger test', t => { | 25 | test.cb('logger test', t => { |
26 | - shelljs.rm('-f', '*.log.*'); | 26 | + shelljs.rm('-f', 'log/*.log.*'); |
27 | logger.info('xxx', () => { | 27 | logger.info('xxx', () => { |
28 | shelljs.ls('info.log.*').forEach(s => console.log('generate log file:' + s)); | 28 | shelljs.ls('info.log.*').forEach(s => console.log('generate log file:' + s)); |
29 | t.end(); | 29 | t.end(); |
@@ -31,6 +31,6 @@ test.cb('logger test', t => { | @@ -31,6 +31,6 @@ test.cb('logger test', t => { | ||
31 | }); | 31 | }); |
32 | 32 | ||
33 | test.after('clean test log file ', t => { | 33 | test.after('clean test log file ', t => { |
34 | - shelljs.rm('-f', '*.log.*'); | 34 | + shelljs.rm('-f', 'log/*.log.*'); |
35 | t.pass(); | 35 | t.pass(); |
36 | }); | 36 | }); |
@@ -5,12 +5,12 @@ | @@ -5,12 +5,12 @@ | ||
5 | * @date: 2016/05/17 | 5 | * @date: 2016/05/17 |
6 | */ | 6 | */ |
7 | 7 | ||
8 | -const test = require('ava').test; | 8 | +const test = require('ava'); |
9 | const sign = require('../../library/sign'); | 9 | const sign = require('../../library/sign'); |
10 | 10 | ||
11 | test('app sign test', t => { | 11 | test('app sign test', t => { |
12 | let params = { | 12 | let params = { |
13 | - client_type: 'h5', | 13 | + client_type: 'h5', // eslint-disable-line |
14 | a: 1, | 14 | a: 1, |
15 | b: 'b' | 15 | b: 'b' |
16 | }; | 16 | }; |
@@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
5 | * @date: 2016/05/17 | 5 | * @date: 2016/05/17 |
6 | */ | 6 | */ |
7 | 7 | ||
8 | -const test = require('ava').test; | 8 | +const test = require('ava'); |
9 | const Timer = require('../../library/timer'); | 9 | const Timer = require('../../library/timer'); |
10 | 10 | ||
11 | const sleep = (timeout) => { | 11 | const sleep = (timeout) => { |
-
Please register or login to post a comment