Merge pull request #2666 from RedisInsight/e2e/feature/desktop-tests-refactoring

E2e/feature/desktop tests refactoring

Author: vlad-dargel

.circleci/config.yml

@@ -372,7 +372,7 @@ jobs:
       - run:
           name: .AppImage tests
           command: |
-            cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
+            cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/electron/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
             .circleci/e2e/test.app-image.sh
       - when:
           condition:
@@ -409,7 +409,7 @@ jobs:
       - run: choco install nodejs --version=18.15.0
       - run:
           command: |
-            cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
+            cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/electron/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
             .circleci/e2e/test.exe.cmd
           shell: bash.exe
       - when:
@@ -460,7 +460,7 @@ jobs:
             - run:
                 name: Run tests
                 command: |
-                  cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
+                  cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/web/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
                   TEST_BIG_DB_DUMP=$TEST_BIG_DB_DUMP \
                   docker-compose \
                   -f tests/e2e/rte.docker-compose.yml \
@@ -474,7 +474,7 @@ jobs:
             - run:
                 name: Run tests
                 command: |
-                  cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
+                  cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/web/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
                   TEST_BIG_DB_DUMP=$TEST_BIG_DB_DUMP \
                   docker-compose \
                   -f tests/e2e/rte.docker-compose.yml \
@@ -1208,6 +1208,18 @@ workflows:
           requires:
             - itest-code
       # E2E tests
+      - setup-sign-certificates:
+          name: Setup sign certificates (stage)
+          requires:
+            - Start All Tests
+      - setup-build:
+          name: Setup build (stage)
+          requires:
+            - Setup sign certificates (stage)
+      - linux:
+          name: Build app - Linux (stage)
+          requires:
+            - Setup build (stage)
       - docker:
           name: Build docker image
           requires:
@@ -1218,6 +1230,11 @@ workflows:
           parallelism: 4
           requires:
             - Build docker image
+      - e2e-app-image:
+          name: E2ETest (AppImage)
+          parallelism: 2
+          requires:
+            - Build app - Linux (stage)
       # Approve to build
       - approve:
           name: Build App

tests/e2e/desktop.runner.ts

@@ -10,13 +10,10 @@ import testcafe from 'testcafe';
                         configPath: 'tsconfig.testcafe.json',
                         experimentalDecorators: true
                      }})
-                .src((process.env.TEST_FILES || 'tests/**/*.e2e.ts').split('\n'))
+                .src((process.env.TEST_FILES || 'tests/electron/**/*.e2e.ts').split('\n'))
                 .browsers(['electron'])
-                .filter((_testName, _fixtureName, _fixturePath, testMeta): boolean => {
-                    return testMeta.env == 'desktop'
-                })
                 .screenshots({
-                    path: 'report/screenshots/',
+                    path: './report/screenshots/',
                     takeOnFails: true,
                     pathPattern: '${USERAGENT}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png',
                 })

tests/e2e/desktop.runner.win.ts

@@ -10,11 +10,8 @@ import testcafe from 'testcafe';
                         configPath: 'tsconfig.testcafe.json',
                         experimentalDecorators: true
                      }})
-                .src((process.env.TEST_FILES || 'tests/**/*.e2e.ts').split('\n'))
+                .src((process.env.TEST_FILES || 'tests/electron/**/*.e2e.ts').split('\n'))
                 .browsers(['electron'])
-                .filter((_testName, _fixtureName, _fixturePath, testMeta): boolean => {
-                    return testMeta.env == 'desktop' && testMeta.rte === 'standalone';
-                })
                 .screenshots({
                     path: 'report/screenshots/',
                     takeOnFails: true,