Merge pull request #1148 from RedisInsight/e2e/bugfix/increase-test-speed

e2e/bugfix/increase-test-speed

Author: vlad-dargel

.circleci/config.yml

@@ -311,7 +311,7 @@ jobs:
       - run:
           name: .AppImage tests
           command: |
-            cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split) && cd ../..
+            cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
             .circleci/e2e/test.app-image.sh
       - when:
           condition:
@@ -348,7 +348,7 @@ jobs:
       - run: choco install nodejs --version=16.15.1
       - run:
           command: |
-            cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split) && cd ../..
+            cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
             .circleci/e2e/test.exe.cmd
           shell: bash.exe
       - when:
@@ -399,7 +399,7 @@ jobs:
             - run:
                 name: Run tests
                 command: |
-                  cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split) && cd ../..
+                  cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.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 \
@@ -413,7 +413,7 @@ jobs:
             - run:
                 name: Run tests
                 command: |
-                  cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split) && cd ../..
+                  cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.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 \
@@ -1218,12 +1218,12 @@ workflows:
           requires:
             - Build docker image
       # e2e desktop tests on AppImage build
-      - e2e-app-image:
-          name: E2ETest (AppImage) - Nightly
-          parallelism: 4
-          report: true
-          requires:
-            - Build app - Linux (stage)
+      # - e2e-app-image:
+      #     name: E2ETest (AppImage) - Nightly
+      #     parallelism: 4
+      #     report: true
+      #     requires:
+      #       - Build app - Linux (stage)
       # # e2e desktop tests on exe build
       # - e2e-exe:
       #     name: E2ETest (exe) - Nightly

tests/e2e/helpers/database.ts

@@ -195,7 +195,6 @@ export async function acceptLicenseTermsAndAddRECloudDatabase(databaseParameters
 export async function acceptLicenseTerms(): Promise<void> {
     await t.maximizeWindow();
     await userAgreementPage.acceptLicenseTerms();
-    await t.expect(userAgreementPage.userAgreementsPopup.visible).notOk('The user agreements popup is not shown', { timeout: 2000 });
 }
 
 //Accept License terms and connect to the RedisStack database

tests/e2e/package.json

@@ -12,7 +12,7 @@
     "build:web": "yarn --cwd ../../ build:web",
     "redis:last": "docker run --name redis-last-version -p 7777:6379 -d redislabs/redismod",
     "start:app": "cross-env SERVER_STATIC_CONTENT=true yarn start:api",
-    "test:chrome": "testcafe --concurrency 1 chrome tests/ -r html:./report/report.html,spec -e -s takeOnFails=true,path=report/screenshots,pathPattern=${OS}_${BROWSER}/${DATE}_${TIME}/${FIXTURE}_${TEST_ID}_${FILE_INDEX}.png",
+    "test:chrome": "testcafe --cache --concurrency 1 chrome tests/ -r html:./report/report.html,spec -e -s takeOnFails=true,path=report/screenshots,pathPattern=${OS}_${BROWSER}/${DATE}_${TIME}/${FIXTURE}_${TEST_ID}_${FILE_INDEX}.png",
     "test:chrome:ci": "ts-node ./web.runner.ts",
     "test": "yarn test:chrome",
     "lint": "eslint . --ext .ts,.js,.tsx,.jsx",

tests/e2e/pageObjects/user-agreement-page.ts

@@ -22,6 +22,7 @@ export class UserAgreementPage {
             await t.click(this.recommendedSwitcher);
             await t.click(this.switchOptionEula);
             await t.click(this.submitButton);
+            await t.expect(this.userAgreementsPopup.visible).notOk('The user agreements popup is not shown', { timeout: 2000 });
         }
     }
 

tests/e2e/web.runner.ts

@@ -6,7 +6,7 @@ import testcafe from 'testcafe';
             return t
                 .createRunner()
                 .src((process.env.TEST_FILES || 'tests/**/*.e2e.ts').split('\n'))
-                .browsers(['chromium:headless --allow-insecure-localhost --ignore-certificate-errors'])
+                .browsers(['chromium:headless --cache --allow-insecure-localhost --ignore-certificate-errors'])
                 .filter((_testName, _fixtureName, _fixturePath, testMeta): boolean => {
                     return testMeta.env !== 'desktop'
                 })
@@ -30,6 +30,7 @@ import testcafe from 'testcafe';
                         output: './report/report.html'
                     }
                 ])
+                // .concurrency(2)
                 .run({
                     skipJsErrors: true,
                     browserInitTimeout: 60000,