Fix CI-nightly tests and refactoring cypress config (#7908)

cvat-ai · May 17, 2024 · 59e31b3 · 59e31b3
1 parent f7b47fe
commit 59e31b3
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 48 deletions.
diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml
@@ -313,6 +313,13 @@ jobs:
           name: cypress_screenshots
           path: ${{ github.workspace }}/tests/cypress/screenshots
 
+      - name: Uploading cypress videos as an artifact
+        if: failure()
+        uses: actions/upload-artifact@v3.1.1
+        with:
+          name: cypress_videos_${{ matrix.specs }}
+          path: ${{ github.workspace }}/tests/cypress/videos
+
       - name: Uploading "cvat" container logs as an artifact
         if: failure()
         uses: actions/upload-artifact@v3.1.1

diff --git a/tests/cypress.base.config.js b/tests/cypress.base.config.js
@@ -0,0 +1,24 @@
+// Copyright (C) 2024 CVAT.ai Corporation
+//
+// SPDX-License-Identifier: MIT
+const plugins = require('./cypress/plugins/index');
+
+module.exports = {
+    video: true,
+    viewportWidth: 1300,
+    viewportHeight: 960,
+    defaultCommandTimeout: 25000,
+    downloadsFolder: 'cypress/fixtures',
+    env: {
+        user: 'admin',
+        email: 'admin@localhost.company',
+        password: '12qwaszx',
+    },
+    e2e: {
+        setupNodeEvents(on, config) {
+            return plugins(on, config);
+        },
+        testIsolation: false,
+        baseUrl: 'http://localhost:8080',
+    },
+};
diff --git a/tests/cypress.config.js b/tests/cypress.config.js
@@ -1,24 +1,11 @@
 const { defineConfig } = require('cypress');
-const plugins = require('./cypress/plugins/index');
+const baseConfig = require('./cypress.base.config');
 
 module.exports = defineConfig({
-    video: true,
-    viewportWidth: 1300,
-    viewportHeight: 960,
-    defaultCommandTimeout: 25000,
+    ...baseConfig,
     numTestsKeptInMemory: 30, // reduce because out of memory issues
-    downloadsFolder: 'cypress/fixtures',
-    env: {
-        user: 'admin',
-        email: 'admin@localhost.company',
-        password: '12qwaszx',
-    },
     e2e: {
-        setupNodeEvents(on, config) {
-            return plugins(on, config);
-        },
-        testIsolation: false,
-        baseUrl: 'http://localhost:8080',
+        ...baseConfig.e2e,
         specPattern: [
             'cypress/e2e/auth_page.js',
             'cypress/e2e/features/*.js',

diff --git a/tests/cypress_canvas3d.config.js b/tests/cypress_canvas3d.config.js
@@ -1,23 +1,10 @@
 const { defineConfig } = require('cypress');
-const plugins = require('./cypress/plugins/index');
+const baseConfig = require('./cypress.base.config');
 
 module.exports = defineConfig({
-    video: false,
-    viewportWidth: 1300,
-    viewportHeight: 960,
-    defaultCommandTimeout: 25000,
-    downloadsFolder: 'cypress/fixtures',
-    env: {
-        user: 'admin',
-        email: 'admin@localhost.company',
-        password: '12qwaszx',
-    },
+    ...baseConfig,
     e2e: {
-        setupNodeEvents(on, config) {
-            return plugins(on, config);
-        },
-        testIsolation: false,
-        baseUrl: 'http://localhost:8080',
+        ...baseConfig.e2e,
         specPattern: [
             'cypress/e2e/auth_page.js',
             'cypress/e2e/canvas3d_functionality/*.js',

diff --git a/tests/nightly_cypress.config.js b/tests/nightly_cypress.config.js
@@ -1,23 +1,10 @@
 const { defineConfig } = require('cypress');
-const plugins = require('./cypress/plugins/index');
+const baseConfig = require('./cypress.base.config');
 
 module.exports = defineConfig({
-    video: false,
-    viewportWidth: 1300,
-    viewportHeight: 960,
-    defaultCommandTimeout: 25000,
-    downloadsFolder: 'cypress/fixtures',
-    env: {
-        user: 'admin',
-        email: 'admin@localhost.company',
-        password: '12qwaszx',
-    },
+    ...baseConfig,
     e2e: {
-        setupNodeEvents(on, config) {
-            return plugins(on, config);
-        },
-        testIsolation: false,
-        baseUrl: 'http://localhost:8080',
+        ...baseConfig.e2e,
         specPattern: [
             'cypress/e2e/auth_page.js',
             'cypress/e2e/features/*.js',