From 4c5144012172791fc5891ad5a6b92e8fafb7e8d3 Mon Sep 17 00:00:00 2001 From: Marc Littlemore Date: Tue, 4 Mar 2025 14:33:11 +0000 Subject: [PATCH] rebase + fix test issues --- .../cli/src/ldap.ee/__tests__/ldap.service.test.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/cli/src/ldap.ee/__tests__/ldap.service.test.ts b/packages/cli/src/ldap.ee/__tests__/ldap.service.test.ts index d9e2ba9ca6..209899cf5c 100644 --- a/packages/cli/src/ldap.ee/__tests__/ldap.service.test.ts +++ b/packages/cli/src/ldap.ee/__tests__/ldap.service.test.ts @@ -9,16 +9,14 @@ import type { Settings } from '@/databases/entities/settings'; import { AuthIdentityRepository } from '@/databases/repositories/auth-identity.repository'; import { SettingsRepository } from '@/databases/repositories/settings.repository'; import type { EventService } from '@/events/event.service'; +import { mockInstance, mockLogger } from '@test/mocking'; + import { BINARY_AD_ATTRIBUTES, LDAP_LOGIN_ENABLED, LDAP_LOGIN_LABEL, LDAP_FEATURE_NAME, -} from '@/ldap/constants'; -import { LdapService } from '@/ldap/ldap.service.ee'; -import type { LdapConfig } from '@/ldap/types'; -import { mockInstance, mockLogger } from '@test/mocking'; - +} from '../constants'; import { getLdapIds, createFilter, @@ -29,6 +27,8 @@ import { saveLdapSynchronization, resolveEntryBinaryAttributes, } from '../helpers.ee'; +import { LdapService } from '../ldap.service.ee'; +import type { LdapConfig } from '../types'; // Mock ldapts client jest.mock('ldapts', () => {