mirror of
https://github.com/n8n-io/n8n.git
synced 2025-03-05 20:50:17 -08:00
rebase + fix test issues
This commit is contained in:
parent
a8eaf4b8af
commit
4c51440121
|
@ -9,16 +9,14 @@ import type { Settings } from '@/databases/entities/settings';
|
||||||
import { AuthIdentityRepository } from '@/databases/repositories/auth-identity.repository';
|
import { AuthIdentityRepository } from '@/databases/repositories/auth-identity.repository';
|
||||||
import { SettingsRepository } from '@/databases/repositories/settings.repository';
|
import { SettingsRepository } from '@/databases/repositories/settings.repository';
|
||||||
import type { EventService } from '@/events/event.service';
|
import type { EventService } from '@/events/event.service';
|
||||||
|
import { mockInstance, mockLogger } from '@test/mocking';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
BINARY_AD_ATTRIBUTES,
|
BINARY_AD_ATTRIBUTES,
|
||||||
LDAP_LOGIN_ENABLED,
|
LDAP_LOGIN_ENABLED,
|
||||||
LDAP_LOGIN_LABEL,
|
LDAP_LOGIN_LABEL,
|
||||||
LDAP_FEATURE_NAME,
|
LDAP_FEATURE_NAME,
|
||||||
} from '@/ldap/constants';
|
} from '../constants';
|
||||||
import { LdapService } from '@/ldap/ldap.service.ee';
|
|
||||||
import type { LdapConfig } from '@/ldap/types';
|
|
||||||
import { mockInstance, mockLogger } from '@test/mocking';
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
getLdapIds,
|
getLdapIds,
|
||||||
createFilter,
|
createFilter,
|
||||||
|
@ -29,6 +27,8 @@ import {
|
||||||
saveLdapSynchronization,
|
saveLdapSynchronization,
|
||||||
resolveEntryBinaryAttributes,
|
resolveEntryBinaryAttributes,
|
||||||
} from '../helpers.ee';
|
} from '../helpers.ee';
|
||||||
|
import { LdapService } from '../ldap.service.ee';
|
||||||
|
import type { LdapConfig } from '../types';
|
||||||
|
|
||||||
// Mock ldapts client
|
// Mock ldapts client
|
||||||
jest.mock('ldapts', () => {
|
jest.mock('ldapts', () => {
|
||||||
|
|
Loading…
Reference in a new issue