[ci-visibility] Test skipping logic for cypress (#3167)

DataDog · Jun 1, 2023 · 40740ae · 40740ae
1 parent bf2d95d
commit 40740ae
Show file tree

Hide file tree

Showing 9 changed files with 415 additions and 151 deletions.
diff --git a/integration-tests/ci-visibility-intake.js b/integration-tests/ci-visibility-intake.js
@@ -161,12 +161,13 @@ class FakeCiVisIntake extends FakeAgent {
     })
   }
 
-  async stop () {
-    await super.stop()
+  stop () {
     settings = DEFAULT_SETTINGS
     suitesToSkip = DEFAULT_SUITES_TO_SKIP
     gitUploadStatus = DEFAULT_GIT_UPLOAD_STATUS
     infoResponse = DEFAULT_INFO_RESPONSE
+    this.removeAllListeners()
+    return super.stop()
   }
 
   // Similar to gatherPayloads but resolves if enough payloads have been gathered
@@ -230,7 +231,7 @@ class FakeCiVisIntake extends FakeAgent {
       }, timeout || 15000)
       const messageHandler = (message) => {
         if (!payloadMatch || payloadMatch(message)) {
-          clearInterval(timeoutId)
+          clearTimeout(timeoutId)
           resolve(message)
           this.off('message', messageHandler)
         }

diff --git a/integration-tests/ci-visibility.spec.js b/integration-tests/ci-visibility.spec.js
@@ -455,7 +455,7 @@ testFrameworks.forEach(({
         receiver.assertPayloadReceived(() => {
           const error = new Error('it should not report code coverage')
           done(error)
-        }, ({ url }) => url === '/api/v2/citestcov')
+        }, ({ url }) => url === '/api/v2/citestcov').catch(() => {})
 
         receiver.assertPayloadReceived(({ headers, payload }) => {
           assert.propertyVal(headers, 'dd-api-key', '1')
@@ -774,7 +774,7 @@ testFrameworks.forEach(({
         receiver.assertPayloadReceived(() => {
           const error = new Error('it should not report code coverage')
           done(error)
-        }, ({ url }) => url === '/evp_proxy/v2/api/v2/citestcov')
+        }, ({ url }) => url === '/evp_proxy/v2/api/v2/citestcov').catch(() => {})
 
         receiver.assertPayloadReceived(({ headers, payload }) => {
           assert.notProperty(headers, 'dd-api-key')

diff --git a/integration-tests/cucumber/cucumber.spec.js b/integration-tests/cucumber/cucumber.spec.js
@@ -317,7 +317,7 @@ versions.forEach(version => {
             receiver.assertPayloadReceived(() => {
               const error = new Error('it should not report code coverage')
               done(error)
-            }, ({ url }) => url.endsWith('/api/v2/citestcov'))
+            }, ({ url }) => url.endsWith('/api/v2/citestcov')).catch(() => {})
 
             receiver.assertPayloadReceived(({ payload }) => {
               const eventTypes = payload.events.map(event => event.type)

diff --git a/integration-tests/cypress-config.json b/integration-tests/cypress-config.json
@@ -3,5 +3,6 @@
   "screenshotOnRunFailure": false,
   "pluginsFile": "cypress/plugins-old/index.js",
   "supportFile": "cypress/support/e2e.js",
-  "integrationFolder": "cypress/e2e"
+  "integrationFolder": "cypress/e2e",
+  "defaultCommandTimeout": 100
 }
diff --git a/integration-tests/cypress.config.js b/integration-tests/cypress.config.js
@@ -1,4 +1,5 @@
 module.exports = {
+  defaultCommandTimeout: 100,
   e2e: {
     setupNodeEvents (on, config) {
       require('dd-trace/ci/cypress/plugin')(on, config)