From 47ff652c93d8534005c497a84405a1d6db70ced5 Mon Sep 17 00:00:00 2001 From: Artem Date: Mon, 5 Sep 2022 14:49:14 +0300 Subject: [PATCH 1/4] remove DLC for docker build job since it doesn't save time to build --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5bec5652d3..3a8f1cf83c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -675,7 +675,7 @@ jobs: - <<: *scan - <<: *validate docker: - executor: linux-executor-dlc + executor: linux-executor parameters: env: type: enum From b9d7de14940a9ef5ebb5ecbbde9587a84cddda8e Mon Sep 17 00:00:00 2001 From: vlad-dargel Date: Mon, 5 Sep 2022 15:09:46 +0200 Subject: [PATCH 2/4] fail test for test result --- tests/e2e/tests/smoke/browser/add-keys.e2e.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/tests/smoke/browser/add-keys.e2e.ts b/tests/e2e/tests/smoke/browser/add-keys.e2e.ts index 1fb1f3a373..3d8744a5e6 100644 --- a/tests/e2e/tests/smoke/browser/add-keys.e2e.ts +++ b/tests/e2e/tests/smoke/browser/add-keys.e2e.ts @@ -31,7 +31,7 @@ test await t.expect(notofication).contains('Key has been added', 'The notification'); //check that new key is displayed in the list await browserPage.searchByKeyName(keyName); - const isKeyIsDisplayedInTheList = await browserPage.isKeyIsDisplayedInTheList(keyName); + const isKeyIsDisplayedInTheList = await browserPage.isKeyIsDisplayedInTheList('Key has been added'); await t.expect(isKeyIsDisplayedInTheList).ok('The key is added'); }); test From d89dc67b02a532f1f4ea4144743c819a31e44c9a Mon Sep 17 00:00:00 2001 From: Artem Date: Mon, 5 Sep 2022 17:24:17 +0300 Subject: [PATCH 3/4] --build docker images to avoid caching old code --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3a8f1cf83c..6336d2b48c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -404,7 +404,7 @@ jobs: docker-compose \ -f tests/e2e/rte.docker-compose.yml \ -f tests/e2e/docker.web.docker-compose.yml \ - up --abort-on-container-exit --force-recreate + up --abort-on-container-exit --force-recreate --build no_output_timeout: 5m - when: condition: From d224b80ec2792daa479bcfa763df5f78ec4ec19b Mon Sep 17 00:00:00 2001 From: vlad-dargel Date: Mon, 5 Sep 2022 17:26:06 +0200 Subject: [PATCH 4/4] add html reporter --- tests/e2e/tests/smoke/browser/add-keys.e2e.ts | 2 +- tests/e2e/web.runner.ts | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/e2e/tests/smoke/browser/add-keys.e2e.ts b/tests/e2e/tests/smoke/browser/add-keys.e2e.ts index 3d8744a5e6..1fb1f3a373 100644 --- a/tests/e2e/tests/smoke/browser/add-keys.e2e.ts +++ b/tests/e2e/tests/smoke/browser/add-keys.e2e.ts @@ -31,7 +31,7 @@ test await t.expect(notofication).contains('Key has been added', 'The notification'); //check that new key is displayed in the list await browserPage.searchByKeyName(keyName); - const isKeyIsDisplayedInTheList = await browserPage.isKeyIsDisplayedInTheList('Key has been added'); + const isKeyIsDisplayedInTheList = await browserPage.isKeyIsDisplayedInTheList(keyName); await t.expect(isKeyIsDisplayedInTheList).ok('The key is added'); }); test diff --git a/tests/e2e/web.runner.ts b/tests/e2e/web.runner.ts index 0287f32905..00d6374787 100644 --- a/tests/e2e/web.runner.ts +++ b/tests/e2e/web.runner.ts @@ -13,7 +13,7 @@ import testcafe from 'testcafe'; .screenshots({ path: 'report/screenshots/', takeOnFails: true, - pathPattern: '${USERAGENT}/${DATE}_${TIME}/${FIXTURE}_${TEST_INDEX}.png', + pathPattern: '${OS}_${BROWSER}/${DATE}_${TIME}/${FIXTURE}_${TEST_INDEX}.png', }) .reporter([ 'spec', @@ -24,6 +24,10 @@ import testcafe from 'testcafe'; { name: 'json', output: './results/e2e.results.json' + }, + { + name: 'html', + output: './report/report.html' } ]) .run({