diff --git a/.circleci/config.yml b/.circleci/config.yml index 5bec5652d3..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: @@ -675,7 +675,7 @@ jobs: - <<: *scan - <<: *validate docker: - executor: linux-executor-dlc + executor: linux-executor parameters: env: type: enum 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({