From 2ba613a5438f993c3874376dd79be9d460ea81d1 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 4 Sep 2019 15:50:40 +0200 Subject: [PATCH] Fix tests --- server/lib/activitypub/follow.ts | 2 +- server/tests/api/server/auto-follows.ts | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/server/lib/activitypub/follow.ts b/server/lib/activitypub/follow.ts index c57e43c91..1abf43cd4 100644 --- a/server/lib/activitypub/follow.ts +++ b/server/lib/activitypub/follow.ts @@ -4,7 +4,7 @@ import { SERVER_ACTOR_NAME } from '../../initializers/constants' import { JobQueue } from '../job-queue' import { logger } from '../../helpers/logger' import { getServerActor } from '../../helpers/utils' -import { ServerModel } from '@server/models/server/server' +import { ServerModel } from '../../models/server/server' async function autoFollowBackIfNeeded (actorFollow: MActorFollowActors) { if (!CONFIG.FOLLOWINGS.INSTANCE.AUTO_FOLLOW_BACK.ENABLED) return diff --git a/server/tests/api/server/auto-follows.ts b/server/tests/api/server/auto-follows.ts index dea9191f2..df468034c 100644 --- a/server/tests/api/server/auto-follows.ts +++ b/server/tests/api/server/auto-follows.ts @@ -143,6 +143,10 @@ describe('Test auto follows', function () { await checkFollow(servers[1], servers[0], true) await resetFollows(servers) + + config.followings.instance.autoFollowBack.enabled = false + config.followers.instance.manualApproval = false + await updateCustomSubConfig(servers[1].url, servers[1].accessToken, config) }) }) -- 2.25.1