From fa4d3e58748b5e35961f40bfec579ab8c14bae95 Mon Sep 17 00:00:00 2001 From: Eylon Malin Date: Thu, 2 Jan 2020 14:08:31 +0200 Subject: cypress test - assertion that use vidBaseUrl taken from cypress config Issue-ID: VID-740 Signed-off-by: Eylon Malin Change-Id: I7bbcaf06d965172c9a92c4e890b8941960d3df7c --- .../cypress/integration/iFrames/instantiation.templates.modal.e2e.ts | 2 +- .../cypress/integration/iFrames/instantiationStatus.e2e.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vid-webpack-master/cypress/integration/iFrames/instantiation.templates.modal.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/instantiation.templates.modal.e2e.ts index 7fb7ea584..73d311555 100644 --- a/vid-webpack-master/cypress/integration/iFrames/instantiation.templates.modal.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/instantiation.templates.modal.e2e.ts @@ -125,7 +125,7 @@ describe('Template', () => { .getElementByDataTestsId('templateButton').click({force: true}) // Open template Modal const serviceModelId = '5c9e863f-2716-467b-8799-4a67f378dcaa'; - const vidBaseUrl = `http://localhost:8080/vid/serviceModels.htm`; + const vidBaseUrl = `${Cypress.config().baseUrl}/serviceModels.htm`; cy.getElementByDataTestsId(`row-${templateJobIdFromE2EFile}`).click(); cy.getElementByDataTestsId('LoadTemplateButton').click().setViewportToDefault(); diff --git a/vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts index 342818a71..cf727b5ea 100644 --- a/vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts @@ -121,7 +121,7 @@ describe('Instantiation status', function () { //see cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json id:8 const jobId = '5c2cd8e5-27d0-42e3-85a1-85db5eaba459'; const serviceModelId = 'e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0'; - const vidBaseUrl = `http://localhost:8080/vid/serviceModels.htm`; + const vidBaseUrl = `${Cypress.config().baseUrl}/serviceModels.htm`; cy.openIframe('app/ui/#/instantiationStatus'); -- cgit 1.2.3-korg