From 0e273ab25a8bb68d66a33c1c3556d75779d38ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Tue, 14 Dec 2021 12:15:08 -0500
Subject: [PATCH] test: fix tests

---
 test/controllers.js | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/test/controllers.js b/test/controllers.js
index cdb6828c97..0a35838d42 100644
--- a/test/controllers.js
+++ b/test/controllers.js
@@ -1649,20 +1649,13 @@ describe('Controllers', () => {
 
 	describe('account follow page', () => {
 		const socketUser = require('../src/socket.io/user');
+		const apiUser = require('../src/api/users');
 		let uid;
-		before((done) => {
-			user.create({ username: 'follower' }, (err, _uid) => {
-				assert.ifError(err);
-				uid = _uid;
-				socketUser.follow({ uid: uid }, { uid: fooUid }, (err) => {
-					assert.ifError(err);
-					socketUser.isFollowing({ uid: uid }, { uid: fooUid }, (err, isFollowing) => {
-						assert.ifError(err);
-						assert(isFollowing);
-						done();
-					});
-				});
-			});
+		before(async () => {
+			uid = await user.create({ username: 'follower' });
+			await apiUser.follow({ uid: uid }, { uid: fooUid });
+			const isFollowing = await socketUser.isFollowing({ uid: uid }, { uid: fooUid });
+			assert(isFollowing);
 		});
 
 		it('should get followers page', (done) => {
@@ -1683,16 +1676,11 @@ describe('Controllers', () => {
 			});
 		});
 
-		it('should return empty after unfollow', (done) => {
-			socketUser.unfollow({ uid: uid }, { uid: fooUid }, (err) => {
-				assert.ifError(err);
-				request(`${nconf.get('url')}/api/user/foo/followers`, { json: true }, (err, res, body) => {
-					assert.ifError(err);
-					assert.equal(res.statusCode, 200);
-					assert.equal(body.users.length, 0);
-					done();
-				});
-			});
+		it('should return empty after unfollow', async () => {
+			await apiUser.unfollow({ uid: uid }, { uid: fooUid });
+			const { res, body } = await helpers.request('get', `/api/user/foo/followers`, { json: true });
+			assert.equal(res.statusCode, 200);
+			assert.equal(body.users.length, 0);
 		});
 	});