graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-30 08:13:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Use TypeScript for tests"

Browse source 
This reverts commit 409964adcb.
This commit is contained in:
Aya Morisawa 2017-02-28 01:58:32 +09:00
parent 409964adcb
commit 0bc1ead411
3 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -19,7 +19,7 @@
"clean": "gulp clean",
"cleanall": "gulp cleanall",
"lint": "gulp lint",
"test": "mocha --compilers ts:ts-node/register --harmony"
"test": "mocha --harmony"
},
"dependencies": {
"@types/bcryptjs": "2.4.0",

32
test/api.ts → test/api.js
View file

@ -10,22 +10,26 @@ process.env.NODE_ENV = 'test';
// Display detail of unhandled promise rejection
process.on('unhandledRejection', console.dir);
const fs = require('fs');
const _chai = require('chai');
const chaiHttp = require('chai-http');
const should = _chai.should();
// Init babel
require('babel-core/register');
require('babel-polyfill');
_chai.use(chaiHttp);
const fs = require('fs');
const chai = require('chai');
const chaiHttp = require('chai-http');
const should = chai.should();
chai.use(chaiHttp);
const server = require('../built/api/server');
const db = require('../built/db/mongodb').default;
const request = (endpoint, params, me?) => new Promise<any>((ok, ng) => {
const request = (endpoint, params, me) => new Promise((ok, ng) => {
const auth = me ? {
i: me.token
} : {};
_chai.request(server)
chai.request(server)
.post(endpoint)
.send(Object.assign(auth, params))
.end((err, res) => {
@ -48,7 +52,7 @@ describe('API', () => {
afterEach(cb => setTimeout(cb, 100));
it('greet server', done => {
_chai.request(server)
chai.request(server)
.get('/')
.end((err, res) => {
res.should.have.status(200);
@ -855,7 +859,7 @@ describe('API', () => {
describe('drive/files/create', () => {
it('ファイルを作成できる', () => new Promise(async (done) => {
const me = await insertSakurako();
_chai.request(server)
chai.request(server)
.post('/drive/files/create')
.field('i', me.token)
.attach('file', fs.readFileSync(__dirname + '/resources/Lenna.png'), 'Lenna.png')
@ -1225,7 +1229,7 @@ describe('API', () => {
});
});
async function insertSakurako(opts?) {
async function insertSakurako(opts) {
return await db.get('users').insert(Object.assign({
token: '!00000000000000000000000000000000',
username: 'sakurako',
@ -1235,7 +1239,7 @@ async function insertSakurako(opts?) {
}, opts));
}
async function insertHimawari(opts?) {
async function insertHimawari(opts) {
return await db.get('users').insert(Object.assign({
token: '!00000000000000000000000000000001',
username: 'himawari',
@ -1245,20 +1249,20 @@ async function insertHimawari(opts?) {
}, opts));
}
async function insertDriveFile(opts?) {
async function insertDriveFile(opts) {
return await db.get('drive_files').insert(Object.assign({
name: 'strawberry-pasta.png'
}, opts));
}
async function insertDriveFolder(opts?) {
async function insertDriveFolder(opts) {
return await db.get('drive_folders').insert(Object.assign({
name: 'my folder',
parent_id: null
}, opts));
}
async function insertApp(opts?) {
async function insertApp(opts) {
return await db.get('apps').insert(Object.assign({
name: 'my app',
secret: 'mysecret'

0
test/text.ts → test/text.js
View file