diff options
| -rw-r--r-- | vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts | 8 | ||||
| -rw-r--r-- | vid-webpack-master/src/app/shared/services/templateService/instantiationTemplates.service.ts | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts index 5f423f8c2..0b19b667c 100644 --- a/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts @@ -47,10 +47,10 @@ describe('Drawing Board: Instantiation Templates', function () { // Then... cy.wait('@expectedPostAsyncInstantiation').then(xhr => { - // cy.readFile('cypress/support/jsonBuilders/mocks/jsons/instantiationTemplates/templates__instance_template.json').then((expectedResult) => { - // convertRollbackOnFailureValueFromStringToBoolean(expectedResult); - // cy.deepCompare(xhr.request.body, expectedResult); - // }); + cy.readFile('cypress/support/jsonBuilders/mocks/jsons/instantiationTemplates/templates__instance_template.json').then((expectedResult) => { + convertRollbackOnFailureValueFromStringToBoolean(expectedResult); + cy.deepCompare(xhr.request.body, expectedResult); + }); }); }); diff --git a/vid-webpack-master/src/app/shared/services/templateService/instantiationTemplates.service.ts b/vid-webpack-master/src/app/shared/services/templateService/instantiationTemplates.service.ts index 21cdc9296..018e0d367 100644 --- a/vid-webpack-master/src/app/shared/services/templateService/instantiationTemplates.service.ts +++ b/vid-webpack-master/src/app/shared/services/templateService/instantiationTemplates.service.ts @@ -6,6 +6,7 @@ import {Observable} from "rxjs"; import {ServiceInstance} from "../../models/serviceInstance"; import {Constants} from "../../utils/constants"; import {createServiceInstance} from "../../storeUtil/utils/service/service.actions"; +import {createServiceInstanceFromTemplate} from "../../storeUtil/utils/useTemplate/useTemplate.action"; @Injectable() export class InstantiationTemplatesService { @@ -19,7 +20,7 @@ export class InstantiationTemplatesService { public retrieveAndStoreInstantiationTemplateTopology(jobId: string, serviceModelId: string): Observable<ServiceInstance> { return this.retrieveInstantiationTemplateTopology(jobId).do((instantiationTemplate: ServiceInstance) => { - this.store.dispatch(createServiceInstance(instantiationTemplate, serviceModelId)); + this.store.dispatch(createServiceInstanceFromTemplate(instantiationTemplate, serviceModelId)); }); }; |