fsolla/teqo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: resolve searchStaffMunicipalityHits conflict after rebase

Browse source
This commit is contained in:
Cursor Agent 2026-08-01 05:27:01 +00:00
parent 1cfe6948d2
commit aa0cc4e15a
No known key found for this signature in database
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib/campaignQuickActionRegistry.ts
View file

@ -1,19 +1,19 @@
import { resolveActivityQuickActions } from '@/lib/activityQuickActions'
import { resolveStaffHomeQuickActions } from '@/lib/campaignHomeActions'
import { resolveMunicipalityQuickActionsForPath } from '@/lib/campaignMunicipalityQuickActions'
import { CAMPAIGN_TERRITORIES_HOME } from '@/lib/campaignPaths'
import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
import {
isDemandDetailPath,
isDemandsListPath,
resolveDemandDetailQuickActions,
resolveDemandsListQuickActions,
} from '@/lib/campaignQuickActionDemands'
import type { CampaignQuickActionContext } from '@/lib/campaignQuickActionContext'
import {
parseActivityQuickActionSurface,
parseOrganizationQuickActionSurface,
} from '@/lib/campaignQuickActionPaths'
import type { CampaignQuickAction } from '@/lib/campaignQuickActionTypes'
import { CAMPAIGN_TERRITORIES_HOME } from '@/lib/campaignPaths'
import type { CampaignRole } from '@/lib/campaignRoles'
import { resolveOrganizationQuickActions } from '@/lib/organizationQuickActions'

9
tests/int/searchStaffMunicipalityHits.int.spec.ts
View file

@ -49,11 +49,7 @@ describe('searchStaffMunicipalityHits (B60)', () => {
const administered = await fixtures.getMunicipality()
let other = await fixtures.getMunicipality()
<<<<<<< HEAD
for (let attempt = 0; attempt < 30; attempt++) {
=======
for (let attempt = 0; attempt < 24; attempt += 1) {
>>>>>>> 8e4385e (test: retry municipality pair when word-start queries collide)
try {
distinctWordStartQuery(other.name, administered.name)
distinctWordStartQuery(administered.name, other.name)
@ -61,15 +57,10 @@ describe('searchStaffMunicipalityHits (B60)', () => {
} catch {
other = await fixtures.getMunicipality()
}
<<<<<<< HEAD
if (attempt === 29) {
throw new Error('could not allocate two municipalities with distinct word-start queries')
}
}
await fixtures.assignMunicipalityAdvisors(administered.id, [advisor.id])
=======
}
>>>>>>> 8e4385e (test: retry municipality pair when word-start queries collide)
const otherQuery = distinctWordStartQuery(other.name, administered.name)
const administeredQuery = distinctWordStartQuery(administered.name, other.name)