Merge remote-tracking branch 'origin' into chuck/web-2435-move-comments-and-webhooks-without-attachments

packages/server/modules/workspaces/tests/helpers/creation.ts

@@ -74,7 +74,7 @@ import {
   upsertRegionAssignmentFactory
 } from '@/modules/workspaces/repositories/regions'
 import { getDb } from '@/modules/multiregion/utils/dbSelector'
-import { WorkspacePlan } from '@/modules/gatekeeper/domain/billing'
+import { WorkspacePlan } from '@/modules/gatekeeperCore/domain/billing'
 
 const { FF_WORKSPACES_MODULE_ENABLED } = getFeatureFlags()
 

packages/server/modules/workspaces/tests/integration/invites.graph.spec.ts

@@ -58,16 +58,14 @@ import {
   validateStreamAccessFactory
 } from '@/modules/core/services/streams/access'
 import { authorizeResolver } from '@/modules/shared'
-import {
-  addStreamInviteAcceptedActivityFactory,
-  addStreamPermissionsAddedActivityFactory
-} from '@/modules/activitystream/services/streamActivity'
+import { addStreamPermissionsAddedActivityFactory } from '@/modules/activitystream/services/streamActivity'
 import { publish } from '@/modules/shared/utils/subscriptions'
 import { getUserFactory } from '@/modules/core/repositories/users'
 import {
   TestInvitesGraphQLOperations,
   buildInvitesGraphqlOperations
 } from '@/modules/workspaces/tests/helpers/invites'
+import { getEventBus } from '@/modules/shared/services/eventBus'
 
 enum InviteByTarget {
   Email = 'email',
@@ -82,10 +80,7 @@ const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
   validateStreamAccess,
   getUser,
   grantStreamPermissions: grantStreamPermissionsFactory({ db }),
-  addStreamInviteAcceptedActivity: addStreamInviteAcceptedActivityFactory({
-    saveActivity,
-    publish
-  }),
+  emitEvent: getEventBus().emit,
   addStreamPermissionsAddedActivity: addStreamPermissionsAddedActivityFactory({
     saveActivity,
     publish

packages/server/modules/workspaces/tests/integration/projects.graph.spec.ts

@@ -582,6 +582,7 @@ isMultiRegionTestMode()
 
         expect(res).to.not.haveGraphQLErrors()
 
+        // TODO: Replace with gql query when possible
         const automation = await tables
           .automations(targetRegionDb)
           .select('*')
@@ -623,6 +624,7 @@ isMultiRegionTestMode()
 
         expect(res).to.not.haveGraphQLErrors()
 
+        // TODO: Replace with gql query when possible
         const automationRun = await tables
           .automationRuns(targetRegionDb)
           .select('*')
@@ -658,6 +660,7 @@ isMultiRegionTestMode()
 
         expect(res).to.not.haveGraphQLErrors()
 
+        // TODO: Replace with gql query when possible
         const comment = await tables
           .comments(targetRegionDb)
           .select('*')