mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-27 01:23:08 +02:00
test - remove unneed async wrappings, drop GridFS drive_file correctly
This commit is contained in:
parent
fb422b4d60
commit
67d32b73f4
1 changed files with 12 additions and 11 deletions
23
test/api.js
23
test/api.js
|
@ -46,7 +46,8 @@ describe('API', () => {
|
|||
beforeEach(() => Promise.all([
|
||||
db.get('users').drop(),
|
||||
db.get('posts').drop(),
|
||||
db.get('drive_files').drop(),
|
||||
db.get('drive_files.files').drop(),
|
||||
db.get('drive_files.chunks').drop(),
|
||||
db.get('drive_folders').drop(),
|
||||
db.get('apps').drop(),
|
||||
db.get('access_tokens').drop(),
|
||||
|
@ -1131,8 +1132,8 @@ describe('API', () => {
|
|||
});
|
||||
});
|
||||
|
||||
async function insertSakurako(opts) {
|
||||
return await db.get('users').insert(Object.assign({
|
||||
function insertSakurako(opts) {
|
||||
return db.get('users').insert(Object.assign({
|
||||
token: '!00000000000000000000000000000000',
|
||||
username: 'sakurako',
|
||||
username_lower: 'sakurako',
|
||||
|
@ -1141,8 +1142,8 @@ async function insertSakurako(opts) {
|
|||
}, opts));
|
||||
}
|
||||
|
||||
async function insertHimawari(opts) {
|
||||
return await db.get('users').insert(Object.assign({
|
||||
function insertHimawari(opts) {
|
||||
return db.get('users').insert(Object.assign({
|
||||
token: '!00000000000000000000000000000001',
|
||||
username: 'himawari',
|
||||
username_lower: 'himawari',
|
||||
|
@ -1151,8 +1152,8 @@ async function insertHimawari(opts) {
|
|||
}, opts));
|
||||
}
|
||||
|
||||
async function insertDriveFile(opts) {
|
||||
return await db.get('drive_files.files').insert({
|
||||
function insertDriveFile(opts) {
|
||||
return db.get('drive_files.files').insert({
|
||||
length: opts.datasize,
|
||||
metadata: Object.assign({
|
||||
name: 'strawberry-pasta.png'
|
||||
|
@ -1160,15 +1161,15 @@ async function insertDriveFile(opts) {
|
|||
});
|
||||
}
|
||||
|
||||
async function insertDriveFolder(opts) {
|
||||
return await db.get('drive_folders').insert(Object.assign({
|
||||
function insertDriveFolder(opts) {
|
||||
return db.get('drive_folders').insert(Object.assign({
|
||||
name: 'my folder',
|
||||
parent_id: null
|
||||
}, opts));
|
||||
}
|
||||
|
||||
async function insertApp(opts) {
|
||||
return await db.get('apps').insert(Object.assign({
|
||||
function insertApp(opts) {
|
||||
return db.get('apps').insert(Object.assign({
|
||||
name: 'my app',
|
||||
secret: 'mysecret'
|
||||
}, opts));
|
||||
|
|
Loading…
Reference in a new issue