diff --git a/packages/editor-ui/src/__tests__/utils.ts b/packages/editor-ui/src/__tests__/utils.ts index 49834e3854..8e0cacf179 100644 --- a/packages/editor-ui/src/__tests__/utils.ts +++ b/packages/editor-ui/src/__tests__/utils.ts @@ -1,3 +1,5 @@ +import { ISettingsState, UserManagementAuthenticationMethod } from '@/Interface'; + export const retry = (assertion: () => any, { interval = 20, timeout = 200 } = {}) => { return new Promise((resolve, reject) => { const startTime = Date.now(); @@ -15,3 +17,106 @@ export const retry = (assertion: () => any, { interval = 20, timeout = 200 } = { tryAgain(); }); }; + +export const waitAllPromises = () => new Promise((resolve) => setTimeout(resolve)); + +export const SETTINGS_STORE_DEFAULT_STATE: ISettingsState = { + settings: { + userActivationSurveyEnabled: false, + allowedModules: {}, + communityNodesEnabled: false, + defaultLocale: '', + endpointWebhook: '', + endpointWebhookTest: '', + enterprise: { + advancedExecutionFilters: false, + sharing: false, + ldap: false, + saml: false, + logStreaming: false, + }, + executionMode: '', + executionTimeout: 0, + hideUsagePage: false, + hiringBannerEnabled: false, + instanceId: '', + isNpmAvailable: false, + license: { environment: 'production' }, + logLevel: 'info', + maxExecutionTimeout: 0, + oauthCallbackUrls: { oauth1: '', oauth2: '' }, + onboardingCallPromptEnabled: false, + personalizationSurveyEnabled: false, + posthog: { + apiHost: '', + apiKey: '', + autocapture: false, + debug: false, + disableSessionRecording: false, + enabled: false, + }, + publicApi: { enabled: false, latestVersion: 0, path: '', swaggerUi: { enabled: false } }, + pushBackend: 'sse', + saveDataErrorExecution: '', + saveDataSuccessExecution: '', + saveManualExecutions: false, + sso: { + ldap: { loginEnabled: false, loginLabel: '' }, + saml: { loginEnabled: false, loginLabel: '' }, + }, + telemetry: { enabled: false }, + templates: { enabled: false, host: '' }, + timezone: '', + urlBaseEditor: '', + urlBaseWebhook: '', + userManagement: { + enabled: false, + smtpSetup: false, + authenticationMethod: UserManagementAuthenticationMethod.Email, + }, + versionCli: '', + versionNotifications: { + enabled: false, + endpoint: '', + infoUrl: '', + }, + workflowCallerPolicyDefaultOption: 'any', + workflowTagsDisabled: false, + deployment: { + type: 'default', + }, + }, + promptsData: { + message: '', + title: '', + showContactPrompt: false, + showValueSurvey: false, + }, + userManagement: { + enabled: false, + showSetupOnFirstLoad: false, + smtpSetup: false, + authenticationMethod: UserManagementAuthenticationMethod.Email, + }, + templatesEndpointHealthy: false, + api: { + enabled: false, + latestVersion: 0, + path: '/', + swaggerUi: { + enabled: false, + }, + }, + ldap: { + loginLabel: '', + loginEnabled: false, + }, + saml: { + loginLabel: '', + loginEnabled: false, + }, + onboardingCallPromptEnabled: false, + saveDataErrorExecution: 'all', + saveDataSuccessExecution: 'all', + saveManualExecutions: false, +}; diff --git a/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts b/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts index 09eaa92ad2..10faa73940 100644 --- a/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts +++ b/packages/editor-ui/src/components/__tests__/ExecutionsList.test.ts @@ -14,7 +14,7 @@ import { showMessage } from '@/mixins/showMessage'; import { i18nInstance } from '@/plugins/i18n'; import type { IWorkflowShortResponse } from '@/Interface'; import type { IExecutionsSummary } from 'n8n-workflow'; -import { waitAllPromises } from '@/utils/testUtils'; +import { waitAllPromises } from '@/__tests__/utils'; const workflowDataFactory = (): IWorkflowShortResponse => ({ createdAt: faker.date.past().toDateString(), diff --git a/packages/editor-ui/src/components/__tests__/SSOLogin.test.ts b/packages/editor-ui/src/components/__tests__/SSOLogin.test.ts index 0ee32a747c..fd09c860e6 100644 --- a/packages/editor-ui/src/components/__tests__/SSOLogin.test.ts +++ b/packages/editor-ui/src/components/__tests__/SSOLogin.test.ts @@ -5,7 +5,7 @@ import { merge } from 'lodash-es'; import SSOLogin from '@/components/SSOLogin.vue'; import { STORES } from '@/constants'; import { useSSOStore } from '@/stores/sso'; -import { SETTINGS_STORE_DEFAULT_STATE } from '@/utils/testUtils'; +import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils'; import { afterEach } from 'vitest'; let pinia: ReturnType; diff --git a/packages/editor-ui/src/stores/__tests__/sso.test.ts b/packages/editor-ui/src/stores/__tests__/sso.test.ts index 3d79f07037..eea1d3684e 100644 --- a/packages/editor-ui/src/stores/__tests__/sso.test.ts +++ b/packages/editor-ui/src/stores/__tests__/sso.test.ts @@ -3,7 +3,7 @@ import { useSettingsStore } from '@/stores/settings'; import { useSSOStore } from '@/stores/sso'; import { merge } from 'lodash-es'; import { IN8nUISettings } from '@/Interface'; -import { SETTINGS_STORE_DEFAULT_STATE } from '@/utils/testUtils'; +import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils'; let ssoStore: ReturnType; let settingsStore: ReturnType; diff --git a/packages/editor-ui/src/utils/__tests__/userUtils.test.ts b/packages/editor-ui/src/utils/__tests__/userUtils.test.ts index d9864b09b4..0a9f98e64d 100644 --- a/packages/editor-ui/src/utils/__tests__/userUtils.test.ts +++ b/packages/editor-ui/src/utils/__tests__/userUtils.test.ts @@ -7,7 +7,7 @@ import { useSSOStore } from '@/stores/sso'; import { IN8nUISettings, IUser } from '@/Interface'; import { routes } from '@/router'; import { VIEWS } from '@/constants'; -import { SETTINGS_STORE_DEFAULT_STATE } from '@/utils/testUtils'; +import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils'; const DEFAULT_SETTINGS: IN8nUISettings = SETTINGS_STORE_DEFAULT_STATE.settings; diff --git a/packages/editor-ui/src/utils/testUtils.ts b/packages/editor-ui/src/utils/testUtils.ts deleted file mode 100644 index 48f11a2c15..0000000000 --- a/packages/editor-ui/src/utils/testUtils.ts +++ /dev/null @@ -1,103 +0,0 @@ -import { ISettingsState, UserManagementAuthenticationMethod } from '@/Interface'; - -export const waitAllPromises = () => new Promise((resolve) => setTimeout(resolve)); - -export const SETTINGS_STORE_DEFAULT_STATE: ISettingsState = { - settings: { - allowedModules: {}, - communityNodesEnabled: false, - defaultLocale: '', - endpointWebhook: '', - endpointWebhookTest: '', - enterprise: { - advancedExecutionFilters: false, - sharing: false, - ldap: false, - saml: false, - logStreaming: false, - }, - executionMode: '', - executionTimeout: 0, - hideUsagePage: false, - hiringBannerEnabled: false, - instanceId: '', - isNpmAvailable: false, - license: { environment: 'production' }, - logLevel: 'info', - maxExecutionTimeout: 0, - oauthCallbackUrls: { oauth1: '', oauth2: '' }, - onboardingCallPromptEnabled: false, - personalizationSurveyEnabled: false, - posthog: { - apiHost: '', - apiKey: '', - autocapture: false, - debug: false, - disableSessionRecording: false, - enabled: false, - }, - publicApi: { enabled: false, latestVersion: 0, path: '', swaggerUi: { enabled: false } }, - pushBackend: 'sse', - saveDataErrorExecution: '', - saveDataSuccessExecution: '', - saveManualExecutions: false, - sso: { - ldap: { loginEnabled: false, loginLabel: '' }, - saml: { loginEnabled: false, loginLabel: '' }, - }, - telemetry: { enabled: false }, - templates: { enabled: false, host: '' }, - timezone: '', - urlBaseEditor: '', - urlBaseWebhook: '', - userManagement: { - enabled: false, - smtpSetup: false, - authenticationMethod: UserManagementAuthenticationMethod.Email, - }, - versionCli: '', - versionNotifications: { - enabled: false, - endpoint: '', - infoUrl: '', - }, - workflowCallerPolicyDefaultOption: 'any', - workflowTagsDisabled: false, - deployment: { - type: 'default', - }, - }, - promptsData: { - message: '', - title: '', - showContactPrompt: false, - showValueSurvey: false, - }, - userManagement: { - enabled: false, - showSetupOnFirstLoad: false, - smtpSetup: false, - authenticationMethod: UserManagementAuthenticationMethod.Email, - }, - templatesEndpointHealthy: false, - api: { - enabled: false, - latestVersion: 0, - path: '/', - swaggerUi: { - enabled: false, - }, - }, - ldap: { - loginLabel: '', - loginEnabled: false, - }, - saml: { - loginLabel: '', - loginEnabled: false, - }, - onboardingCallPromptEnabled: false, - saveDataErrorExecution: 'all', - saveDataSuccessExecution: 'all', - saveManualExecutions: false, -}; diff --git a/packages/editor-ui/src/views/__tests__/SamlOnboarding.test.ts b/packages/editor-ui/src/views/__tests__/SamlOnboarding.test.ts index 524144b160..3cb5b30153 100644 --- a/packages/editor-ui/src/views/__tests__/SamlOnboarding.test.ts +++ b/packages/editor-ui/src/views/__tests__/SamlOnboarding.test.ts @@ -7,7 +7,7 @@ import { merge } from 'lodash-es'; import SamlOnboarding from '@/views/SamlOnboarding.vue'; import { useSSOStore } from '@/stores/sso'; import { STORES } from '@/constants'; -import { SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/utils/testUtils'; +import { SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/__tests__/utils'; import { i18nInstance } from '@/plugins/i18n'; vi.mock('vue-router/composables', () => { diff --git a/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts b/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts index 1da485a4c2..a567501718 100644 --- a/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts +++ b/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts @@ -7,7 +7,7 @@ import { faker } from '@faker-js/faker'; import SettingsSso from '@/views/SettingsSso.vue'; import { useSSOStore } from '@/stores/sso'; import { STORES } from '@/constants'; -import { SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/utils/testUtils'; +import { SETTINGS_STORE_DEFAULT_STATE, waitAllPromises } from '@/__tests__/utils'; import { i18nInstance } from '@/plugins/i18n'; import { SamlPreferences, SamlPreferencesExtractedData } from '@/Interface';