test - remove unneed async wrappings, drop GridFS drive_file correctly

1 files changed, 12 insertions, 11 deletions

diff --git a/test/api.js b/test/api.js
index c0da9d6c5b..7e26dfe07d 100644
--- a/test/api.js
+++ b/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));