Try to improve server tests compilation speed

diff --git a/server/models/activitypub/actor-follow.ts b/server/models/activitypub/actor-follow.ts
index 1b272e1c82014bb11c1d952ff23b6e2626c5b158..f9b4f57f3413d9a66d117c971d06c6eae1263f17 100644 (file)
--- a/server/models/activitypub/actor-follow.ts
+++ b/server/models/activitypub/actor-follow.ts
@@ -22,8 +22,7 @@ import { FollowState } from '../../../shared/models/actors'
 import { ActorFollow } from '../../../shared/models/actors/follow.model'
 import { logger } from '../../helpers/logger'
 import { getServerActor } from '../../helpers/utils'
-import { ACTOR_FOLLOW_SCORE } from '../../initializers/constants'
-import { FOLLOW_STATES } from '../../initializers/constants'
+import { ACTOR_FOLLOW_SCORE, FOLLOW_STATES } from '../../initializers/constants'
 import { ServerModel } from '../server/server'
 import { getSort } from '../utils'
 import { ActorModel, unusedActorAttributesForAPI } from './actor'

diff --git a/server/tests/api/activitypub/security.ts b/server/tests/api/activitypub/security.ts
index a923268460eb3a827616122bbd568d6d6ca96e35..2c55876bad01464f91d9f77a4679d09206a0eadd 100644 (file)
--- a/server/tests/api/activitypub/security.ts
+++ b/server/tests/api/activitypub/security.ts
@@ -7,8 +7,6 @@ import {
   flushAndRunMultipleServers,
   flushTests,
   killallServers,
-  makeFollowRequest,
-  makePOSTAPRequest,
   ServerInfo,
   setActorField
 } from '../../../../shared/utils'
@@ -16,6 +14,7 @@ import { HTTP_SIGNATURE } from '../../../initializers/constants'
 import { buildDigest, buildGlobalHeaders } from '../../../lib/job-queue/handlers/utils/activitypub-http-utils'
 import * as chai from 'chai'
 import { activityPubContextify, buildSignedActivity } from '../../../helpers/activitypub'
+import { makeFollowRequest, makePOSTAPRequest } from '../../../../shared/utils/requests/activitypub'
 
 const expect = chai.expect
 

diff --git a/shared/utils/index.ts b/shared/utils/index.ts
index 469546872ead5683ad13453615945793956afa96..9d0bbaa38402254980a3425eb5b2d997f61a7797 100644 (file)
--- a/shared/utils/index.ts
+++ b/shared/utils/index.ts
@@ -8,7 +8,6 @@ export * from './miscs/miscs'
 export * from './miscs/stubs'
 export * from './miscs/sql'
 export * from './server/follows'
-export * from './requests/activitypub'
 export * from './requests/requests'
 export * from './requests/check-api-params'
 export * from './server/servers'