fix dependency unit tests

hpi-schul-cloud · Nov 27, 2023 · 7df6b85 · 7df6b85
1 parent 25745b1
commit 7df6b85
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 4 deletions.
diff --git a/...ver/src/modules/tool/context-external-tool/controller/api-test/tool-reference.api.spec.ts b/...ver/src/modules/tool/context-external-tool/controller/api-test/tool-reference.api.spec.ts
@@ -14,7 +14,12 @@ import {
 } from '@shared/testing';
 import { ServerTestModule } from '@modules/server';
 import { Response } from 'supertest';
-import { ToolContextType } from '../../../common/enum';
+import {
+	CustomParameterLocation,
+	CustomParameterScope,
+	CustomParameterType,
+	ToolContextType,
+} from '../../../common/enum';
 import { ExternalToolEntity } from '../../../external-tool/entity';
 import { SchoolExternalToolEntity } from '../../../school-external-tool/entity';
 import { ContextExternalToolEntity, ContextExternalToolType } from '../../entity';
@@ -114,6 +119,24 @@ describe('ToolReferenceController (API)', () => {
 				const course: Course = courseFactory.buildWithId({ school, teachers: [adminUser] });
 				const externalToolEntity: ExternalToolEntity = externalToolEntityFactory.buildWithId({
 					logoBase64: 'logoBase64',
+					parameters: [
+						{
+							name: 'schoolMockParameter',
+							displayName: 'MockParameter',
+							scope: CustomParameterScope.SCHOOL,
+							type: CustomParameterType.STRING,
+							location: CustomParameterLocation.PATH,
+							isOptional: false,
+						},
+						{
+							name: 'contextMockParameter',
+							displayName: 'MockParameter',
+							scope: CustomParameterScope.CONTEXT,
+							type: CustomParameterType.STRING,
+							location: CustomParameterLocation.PATH,
+							isOptional: false,
+						},
+					],
 				});
 				const schoolExternalToolEntity: SchoolExternalToolEntity = schoolExternalToolEntityFactory.buildWithId({
 					school,
@@ -233,6 +256,24 @@ describe('ToolReferenceController (API)', () => {
 				const course: Course = courseFactory.buildWithId({ school, teachers: [adminUser] });
 				const externalToolEntity: ExternalToolEntity = externalToolEntityFactory.buildWithId({
 					logoBase64: 'logoBase64',
+					parameters: [
+						{
+							name: 'schoolMockParameter',
+							displayName: 'MockParameter',
+							scope: CustomParameterScope.SCHOOL,
+							type: CustomParameterType.STRING,
+							location: CustomParameterLocation.PATH,
+							isOptional: false,
+						},
+						{
+							name: 'contextMockParameter',
+							displayName: 'MockParameter',
+							scope: CustomParameterScope.CONTEXT,
+							type: CustomParameterType.STRING,
+							location: CustomParameterLocation.PATH,
+							isOptional: false,
+						},
+					],
 				});
 				const schoolExternalToolEntity: SchoolExternalToolEntity = schoolExternalToolEntityFactory.buildWithId({
 					school,

diff --git a/apps/server/src/modules/tool/external-tool/uc/external-tool-configuration.uc.spec.ts b/apps/server/src/modules/tool/external-tool/uc/external-tool-configuration.uc.spec.ts
@@ -268,6 +268,9 @@ describe('ExternalToolConfigurationUc', () => {
 				externalToolConfigurationService.filterForAvailableExternalTools.mockReturnValue([
 					{ externalTool: usedTool, schoolExternalTool: usedSchoolExternalTool },
 				]);
+				externalToolConfigurationService.filterForContextRestrictions.mockReturnValue([
+					{ externalTool: usedTool, schoolExternalTool: usedSchoolExternalTool },
+				]);
 
 				return {
 					toolIds,
@@ -368,6 +371,7 @@ describe('ExternalToolConfigurationUc', () => {
 					unusedSchoolExternalTool,
 				]);
 				externalToolConfigurationService.filterForAvailableExternalTools.mockReturnValue([]);
+				externalToolConfigurationService.filterForContextRestrictions.mockReturnValue([]);
 
 				return {};
 			};
@@ -409,6 +413,9 @@ describe('ExternalToolConfigurationUc', () => {
 				externalToolConfigurationService.filterForAvailableExternalTools.mockReturnValue([
 					{ externalTool: usedTool, schoolExternalTool: usedSchoolExternalTool },
 				]);
+				externalToolConfigurationService.filterForContextRestrictions.mockReturnValue([
+					{ externalTool: usedTool, schoolExternalTool: usedSchoolExternalTool },
+				]);
 
 				return {
 					usedTool,

diff --git a/...erver/src/modules/tool/tool-launch/controller/api-test/tool-launch.controller.api.spec.ts b/...erver/src/modules/tool/tool-launch/controller/api-test/tool-launch.controller.api.spec.ts
@@ -19,7 +19,12 @@ import { SchoolExternalToolEntity } from '../../../school-external-tool/entity';
 import { LaunchRequestMethod } from '../../types';
 import { ToolLaunchRequestResponse, ToolLaunchParams } from '../dto';
 import { ContextExternalToolEntity, ContextExternalToolType } from '../../../context-external-tool/entity';
-import { ExternalToolEntity } from '../../../external-tool/entity';
+import {
+	CustomParameterLocation,
+	CustomParameterScope,
+	CustomParameterType,
+	ExternalToolEntity,
+} from '../../../external-tool/entity';
 import { ToolConfigType } from '../../../common/enum';
 
 describe('ToolLaunchController (API)', () => {
@@ -64,6 +69,24 @@ describe('ToolLaunchController (API)', () => {
 				const externalToolEntity: ExternalToolEntity = externalToolEntityFactory.buildWithId({
 					config: basicToolConfigFactory.build({ baseUrl: 'https://mockurl.de', type: ToolConfigType.BASIC }),
 					version: 0,
+					parameters: [
+						{
+							name: 'schoolMockParameter',
+							displayName: 'MockParameter',
+							scope: CustomParameterScope.SCHOOL,
+							type: CustomParameterType.STRING,
+							location: CustomParameterLocation.PATH,
+							isOptional: false,
+						},
+						{
+							name: 'contextMockParameter',
+							displayName: 'MockParameter',
+							scope: CustomParameterScope.CONTEXT,
+							type: CustomParameterType.STRING,
+							location: CustomParameterLocation.PATH,
+							isOptional: false,
+						},
+					],
 				});
 				const schoolExternalToolEntity: SchoolExternalToolEntity = schoolExternalToolEntityFactory.buildWithId({
 					tool: externalToolEntity,

diff --git a/apps/server/src/shared/testing/factory/context-external-tool-entity.factory.ts b/apps/server/src/shared/testing/factory/context-external-tool-entity.factory.ts
@@ -17,7 +17,7 @@ export const contextExternalToolEntityFactory = BaseFactory.define<
 		contextType: ContextExternalToolType.COURSE,
 		displayName: 'My Course Tool 1',
 		schoolTool: schoolExternalToolEntityFactory.buildWithId(),
-		parameters: [new CustomParameterEntryEntity({ name: 'mockParamater', value: 'mockValue' })],
+		parameters: [new CustomParameterEntryEntity({ name: 'contextMockParameter', value: 'mockValue' })],
 		toolVersion: 1,
 	};
 });
diff --git a/apps/server/src/shared/testing/factory/school-external-tool-entity.factory.ts b/apps/server/src/shared/testing/factory/school-external-tool-entity.factory.ts
@@ -10,7 +10,7 @@ export const schoolExternalToolEntityFactory = BaseFactory.define<
 	return {
 		tool: externalToolEntityFactory.buildWithId(),
 		school: schoolFactory.buildWithId(),
-		schoolParameters: [{ name: 'mockParamater', value: 'mockValue' }],
+		schoolParameters: [{ name: 'schoolMockParameter', value: 'mockValue' }],
 		toolVersion: 0,
 	};
 });