From 6f900cc45d7dd7f97430812b86b5c1d1693c8ae3 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Wed, 29 Aug 2018 17:01:32 +0300 Subject: merge from ecomp a88f0072 - Modern UI Issue-ID: VID-378 Change-Id: Ibcb23dd27f550cf32ce2fe0239f0f496ae014ff6 Signed-off-by: Ittay Stern --- .../integration/shared/error.message.popup.e2e.ts | 6 ++++- .../cypress/integration/shared/spinner.e2e.ts | 28 ++++++++++++++-------- 2 files changed, 23 insertions(+), 11 deletions(-) (limited to 'vid-webpack-master/cypress/integration/shared') diff --git a/vid-webpack-master/cypress/integration/shared/error.message.popup.e2e.ts b/vid-webpack-master/cypress/integration/shared/error.message.popup.e2e.ts index 8e78067e1..69021132c 100644 --- a/vid-webpack-master/cypress/integration/shared/error.message.popup.e2e.ts +++ b/vid-webpack-master/cypress/integration/shared/error.message.popup.e2e.ts @@ -18,7 +18,11 @@ describe('Error message popup', function () { }) }); - it('spinner should display after api call', function () { + afterEach(() => { + cy.screenshot(); + }); + + it('error should display on api error', function () { // adding call with delay of 2000 sec cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json').then((res) => { jsonBuilderInstantiationBuilder.basicJson(res, Cypress.config('baseUrl') + "/asyncInstantiation**", 500,0, "error 500 asyncInstantiation"); diff --git a/vid-webpack-master/cypress/integration/shared/spinner.e2e.ts b/vid-webpack-master/cypress/integration/shared/spinner.e2e.ts index 35f386fd5..438e7bc3a 100644 --- a/vid-webpack-master/cypress/integration/shared/spinner.e2e.ts +++ b/vid-webpack-master/cypress/integration/shared/spinner.e2e.ts @@ -17,20 +17,28 @@ describe('Spinner', function () { }) }); + afterEach(() => { + cy.screenshot(); + }); + it('spinner should display after api call', function () { - cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json').then((res) => { + const timeBomb:Date = new Date(2018,6,10,0,0,0); //month 6 is July + if (new Date(Date.now()) > timeBomb) { + + cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json').then((res) => { - jsonBuilderInstantiationBuilder.basicJson(res, - Cypress.config('baseUrl') + "/asyncInstantiation**", - 200, - 2000, - "error 500 asyncInstantiation"); - cy.openIframe('app/ui/#/instantiationStatus'); + jsonBuilderInstantiationBuilder.basicJson(res, + Cypress.config('baseUrl') + "/asyncInstantiation**", + 200, + 4000, + "error 500 asyncInstantiation"); + cy.openIframe('app/ui/#/instantiationStatus'); - cy.get('.spinner') - .and('be.visible'); + cy.get('.sdc-loader') + .and('be.visible'); - }); + }); + } }); }); }); -- cgit 1.2.3-korg