Merge branch 'dev' into refactor/common
This commit is contained in:
		
						commit
						a4408b5bc0
					
				
					 145 changed files with 3437 additions and 2822 deletions
				
			
		|  | @ -78,7 +78,7 @@ describe('DatabaseLearningObjectProvider', () => { | |||
|         }); | ||||
|         it('should throw an error if queried with a path identifier for which there is no learning path', async () => { | ||||
|             await expect( | ||||
|                 (async () => { | ||||
|                 (async (): Promise<void> => { | ||||
|                     await databaseLearningObjectProvider.getLearningObjectIdsFromPath({ | ||||
|                         hruid: 'non_existing_hruid', | ||||
|                         language: Language.Dutch, | ||||
|  | @ -97,7 +97,7 @@ describe('DatabaseLearningObjectProvider', () => { | |||
|         }); | ||||
|         it('should throw an error if queried with a path identifier for which there is no learning path', async () => { | ||||
|             await expect( | ||||
|                 (async () => { | ||||
|                 (async (): Promise<void> => { | ||||
|                     await databaseLearningObjectProvider.getLearningObjectsFromPath({ | ||||
|                         hruid: 'non_existing_hruid', | ||||
|                         language: Language.Dutch, | ||||
|  |  | |||
|  | @ -5,7 +5,7 @@ import { LearningObject } from '../../../src/entities/content/learning-object.en | |||
| import { getLearningObjectRepository, getLearningPathRepository } from '../../../src/data/repositories'; | ||||
| import learningObjectExample from '../../test-assets/learning-objects/pn-werkingnotebooks/pn-werkingnotebooks-example'; | ||||
| import learningObjectService from '../../../src/services/learning-objects/learning-object-service'; | ||||
| import { EnvVars, getEnvVar } from '../../../src/util/envvars'; | ||||
| import { envVars, getEnvVar } from '../../../src/util/envVars'; | ||||
| import { LearningPath } from '../../../src/entities/content/learning-path.entity'; | ||||
| import learningPathExample from '../../test-assets/learning-paths/pn-werking-example'; | ||||
| import { LearningObjectIdentifier, LearningPathIdentifier } from 'dwengo-1-common/src/interfaces/learning-content'; | ||||
|  | @ -79,7 +79,7 @@ describe('LearningObjectService', () => { | |||
|                 expect(result).not.toBeNull(); | ||||
| 
 | ||||
|                 const responseFromDwengoApi = await fetch( | ||||
|                     getEnvVar(EnvVars.LearningContentRepoApiBaseUrl) + | ||||
|                     getEnvVar(envVars.LearningContentRepoApiBaseUrl) + | ||||
|                         `/learningObject/getRaw?hruid=${DWENGO_TEST_LEARNING_OBJECT_ID.hruid}&language=${DWENGO_TEST_LEARNING_OBJECT_ID.language}&version=${DWENGO_TEST_LEARNING_OBJECT_ID.version}` | ||||
|                 ); | ||||
|                 const responseHtml = await responseFromDwengoApi.text(); | ||||
|  |  | |||
		Reference in a new issue