delete duplicate mock settings, and fix the tests

n8n-io · Mar 15, 2024 · a3cf337 · a3cf337
1 parent ef7adca
commit a3cf337
Show file tree

Hide file tree

Showing 4 changed files with 115 additions and 197 deletions.
diff --git a/packages/editor-ui/src/__tests__/defaults.ts b/packages/editor-ui/src/__tests__/defaults.ts
@@ -1,4 +1,4 @@
-import type { INodeTypeData, INodeTypeDescription } from 'n8n-workflow';
+import type { INodeTypeData, INodeTypeDescription, IN8nUISettings } from 'n8n-workflow';
 import { AGENT_NODE_TYPE, CHAT_TRIGGER_NODE_TYPE, MANUAL_TRIGGER_NODE_TYPE } from '@/constants';
 import nodeTypesJson from '../../../nodes-base/dist/types/nodes.json';
 import aiNodeTypesJson from '../../../@n8n/nodes-langchain/dist/types/nodes.json';
@@ -42,3 +42,111 @@ export function mockNodeTypesToArray(nodeTypes: INodeTypeData): INodeTypeDescrip
 
 export const defaultMockNodeTypesArray: INodeTypeDescription[] =
 	mockNodeTypesToArray(defaultMockNodeTypes);
+
+export const defaultSettings: IN8nUISettings = {
+	allowedModules: {},
+	communityNodesEnabled: false,
+	defaultLocale: '',
+	endpointForm: '',
+	endpointFormTest: '',
+	endpointFormWaiting: '',
+	endpointWebhook: '',
+	endpointWebhookTest: '',
+	enterprise: {
+		sharing: false,
+		ldap: false,
+		saml: false,
+		logStreaming: false,
+		debugInEditor: false,
+		advancedExecutionFilters: false,
+		variables: true,
+		sourceControl: false,
+		auditLogs: false,
+		showNonProdBanner: false,
+		workflowHistory: false,
+		binaryDataS3: false,
+		externalSecrets: false,
+		workerView: false,
+		advancedPermissions: false,
+	},
+	expressions: {
+		evaluator: 'tournament',
+	},
+	executionMode: 'regular',
+	executionTimeout: 0,
+	hideUsagePage: false,
+	hiringBannerEnabled: false,
+	instanceId: '',
+	isNpmAvailable: false,
+	license: { environment: 'development' },
+	logLevel: 'info',
+	maxExecutionTimeout: 0,
+	oauthCallbackUrls: { oauth1: '', oauth2: '' },
+	onboardingCallPromptEnabled: false,
+	personalizationSurveyEnabled: false,
+	releaseChannel: 'stable',
+	posthog: {
+		apiHost: '',
+		apiKey: '',
+		autocapture: false,
+		debug: false,
+		disableSessionRecording: false,
+		enabled: false,
+	},
+	publicApi: { enabled: false, latestVersion: 0, path: '', swaggerUi: { enabled: false } },
+	pushBackend: 'websocket',
+	saveDataErrorExecution: 'DEFAULT',
+	saveDataSuccessExecution: 'DEFAULT',
+	saveManualExecutions: false,
+	sso: {
+		ldap: { loginEnabled: false, loginLabel: '' },
+		saml: { loginEnabled: false, loginLabel: '' },
+	},
+	telemetry: {
+		enabled: false,
+	},
+	templates: { enabled: false, host: '' },
+	timezone: '',
+	urlBaseEditor: '',
+	urlBaseWebhook: '',
+	authCookie: {
+		secure: false,
+	},
+	userManagement: {
+		showSetupOnFirstLoad: false,
+		smtpSetup: true,
+		authenticationMethod: 'email',
+		quota: 10,
+	},
+	versionCli: '',
+	versionNotifications: {
+		enabled: true,
+		endpoint: '',
+		infoUrl: '',
+	},
+	workflowCallerPolicyDefaultOption: 'any',
+	workflowTagsDisabled: false,
+	variables: {
+		limit: -1,
+	},
+	deployment: {
+		type: 'default',
+	},
+	banners: {
+		dismissed: [],
+	},
+	binaryDataMode: 'default',
+	previewMode: false,
+	mfa: {
+		enabled: false,
+	},
+	ai: {
+		enabled: false,
+		provider: '',
+		errorDebugging: false,
+	},
+	workflowHistory: {
+		pruneTime: 0,
+		licensePruneTime: 0,
+	},
+};
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/settings.ts b/packages/editor-ui/src/__tests__/server/endpoints/settings.ts
@@ -1,115 +1,7 @@
 import type { Server } from 'miragejs';
 import { Response } from 'miragejs';
 import type { AppSchema } from '../types';
-import type { IN8nUISettings } from 'n8n-workflow';
-
-const defaultSettings: IN8nUISettings = {
-	allowedModules: {},
-	communityNodesEnabled: false,
-	defaultLocale: '',
-	endpointForm: '',
-	endpointFormTest: '',
-	endpointFormWaiting: '',
-	endpointWebhook: '',
-	endpointWebhookTest: '',
-	enterprise: {
-		sharing: false,
-		ldap: false,
-		saml: false,
-		logStreaming: false,
-		debugInEditor: false,
-		advancedExecutionFilters: false,
-		variables: true,
-		sourceControl: false,
-		auditLogs: false,
-		showNonProdBanner: false,
-		workflowHistory: false,
-		binaryDataS3: false,
-		externalSecrets: false,
-		workerView: false,
-		advancedPermissions: false,
-	},
-	expressions: {
-		evaluator: 'tournament',
-	},
-	executionMode: 'regular',
-	executionTimeout: 0,
-	hideUsagePage: false,
-	hiringBannerEnabled: false,
-	instanceId: '',
-	isNpmAvailable: false,
-	license: { environment: 'development' },
-	logLevel: 'info',
-	maxExecutionTimeout: 0,
-	oauthCallbackUrls: { oauth1: '', oauth2: '' },
-	onboardingCallPromptEnabled: false,
-	personalizationSurveyEnabled: false,
-	releaseChannel: 'stable',
-	posthog: {
-		apiHost: '',
-		apiKey: '',
-		autocapture: false,
-		debug: false,
-		disableSessionRecording: false,
-		enabled: false,
-	},
-	publicApi: { enabled: false, latestVersion: 0, path: '', swaggerUi: { enabled: false } },
-	pushBackend: 'websocket',
-	saveDataErrorExecution: 'DEFAULT',
-	saveDataSuccessExecution: 'DEFAULT',
-	saveManualExecutions: false,
-	sso: {
-		ldap: { loginEnabled: false, loginLabel: '' },
-		saml: { loginEnabled: false, loginLabel: '' },
-	},
-	telemetry: {
-		enabled: false,
-	},
-	templates: { enabled: false, host: '' },
-	timezone: '',
-	urlBaseEditor: '',
-	urlBaseWebhook: '',
-	authCookie: {
-		secure: false,
-	},
-	userManagement: {
-		showSetupOnFirstLoad: false,
-		smtpSetup: true,
-		authenticationMethod: 'email',
-		quota: 10,
-	},
-	versionCli: '',
-	versionNotifications: {
-		enabled: true,
-		endpoint: '',
-		infoUrl: '',
-	},
-	workflowCallerPolicyDefaultOption: 'any',
-	workflowTagsDisabled: false,
-	variables: {
-		limit: -1,
-	},
-	deployment: {
-		type: 'default',
-	},
-	banners: {
-		dismissed: [],
-	},
-	binaryDataMode: 'default',
-	previewMode: false,
-	mfa: {
-		enabled: false,
-	},
-	ai: {
-		enabled: false,
-		provider: '',
-		errorDebugging: false,
-	},
-	workflowHistory: {
-		pruneTime: 0,
-		licensePruneTime: 0,
-	},
-};
+import { defaultSettings } from '../../defaults';
 
 export function routesForSettings(server: Server) {
 	server.get('/rest/settings', (schema: AppSchema) => {

diff --git a/packages/editor-ui/src/__tests__/utils.ts b/packages/editor-ui/src/__tests__/utils.ts
@@ -1,5 +1,6 @@
 import type { ISettingsState } from '@/Interface';
 import { UserManagementAuthenticationMethod } from '@/Interface';
+import { defaultSettings } from './defaults';
 
 export const retry = async (
 	assertion: () => ReturnType<typeof expect>,
@@ -25,103 +26,18 @@ export const retry = async (
 export const waitAllPromises = async () => await new Promise((resolve) => setTimeout(resolve));
 
 export const SETTINGS_STORE_DEFAULT_STATE: ISettingsState = {
-	settings: {
-		allowedModules: {},
-		communityNodesEnabled: false,
-		defaultLocale: '',
-		endpointForm: '',
-		endpointFormTest: '',
-		endpointFormWaiting: '',
-		endpointWebhook: '',
-		endpointWebhookTest: '',
-		enterprise: {
-			advancedExecutionFilters: false,
-			sharing: false,
-			ldap: false,
-			saml: false,
-			logStreaming: false,
-			variables: false,
-			sourceControl: false,
-			auditLogs: false,
-		},
-		executionMode: 'regular',
-		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: 'all',
-		saveDataSuccessExecution: 'all',
-		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',
-		},
-		variables: {
-			limit: 100,
-		},
-		expressions: {
-			evaluator: 'tournament',
-		},
-		banners: {
-			dismissed: [],
-		},
-		ai: {
-			enabled: false,
-		},
-		workflowHistory: {
-			pruneTime: -1,
-			licensePruneTime: -1,
-		},
-	},
+	settings: defaultSettings,
 	promptsData: {
 		message: '',
 		title: '',
 		showContactPrompt: false,
 		showValueSurvey: false,
 	},
 	userManagement: {
-		enabled: false,
 		showSetupOnFirstLoad: false,
 		smtpSetup: false,
 		authenticationMethod: UserManagementAuthenticationMethod.Email,
+		quota: defaultSettings.userManagement.quota,
 	},
 	templatesEndpointHealthy: false,
 	api: {

diff --git a/packages/editor-ui/src/stores/__tests__/posthog.test.ts b/packages/editor-ui/src/stores/__tests__/posthog.test.ts
@@ -7,6 +7,7 @@ import { useTelemetryStore } from '@/stores/telemetry.store';
 import type { IN8nUISettings } from 'n8n-workflow';
 import { LOCAL_STORAGE_EXPERIMENT_OVERRIDES } from '@/constants';
 import { nextTick } from 'vue';
+import { defaultSettings } from '../../__tests__/defaults';
 
 const DEFAULT_POSTHOG_SETTINGS: IN8nUISettings['posthog'] = {
 	enabled: true,
@@ -21,6 +22,7 @@ const CURRENT_INSTANCE_ID = '456';
 
 function setSettings(overrides?: Partial<IN8nUISettings>) {
 	useSettingsStore().setSettings({
+		...defaultSettings,
 		posthog: DEFAULT_POSTHOG_SETTINGS,
 		instanceId: CURRENT_INSTANCE_ID,
 		...overrides,