[ci-app] fix this.skip (DataDog#1550)

atif-saddique-deel · Aug 5, 2021 · cc3952d · cc3952d
1 parent 9d2d267
commit cc3952d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/packages/datadog-plugin-mocha/src/index.js b/packages/datadog-plugin-mocha/src/index.js
@@ -79,8 +79,13 @@ function createWrapRunTest (tracer, testEnvironmentMetadata, sourceRoot) {
               activeSpan.setTag(TEST_STATUS, 'fail')
             }
           } catch (error) {
-            activeSpan.setTag(TEST_STATUS, 'fail')
-            activeSpan.setTag('error', error)
+            // this.skip has been called
+            if (error.constructor.name === 'Pending' && !this.forbidPending) {
+              activeSpan.setTag(TEST_STATUS, 'skip')
+            } else {
+              activeSpan.setTag(TEST_STATUS, 'fail')
+              activeSpan.setTag('error', error)
+            }
             throw error
           } finally {
             finishAllTraceSpans(activeSpan)

diff --git a/packages/datadog-plugin-mocha/test/index.spec.js b/packages/datadog-plugin-mocha/test/index.spec.js
@@ -165,7 +165,8 @@ describe('Plugin', () => {
         const testNames = [
           'mocha-test-skip can skip',
           'mocha-test-skip-different can skip too',
-          'mocha-test-skip-different can skip twice'
+          'mocha-test-skip-different can skip twice',
+          'mocha-test-programmatic-skip can skip too'
         ]
         const assertionPromises = testNames.map(testName => {
           return agent.use(trace => {

diff --git a/packages/datadog-plugin-mocha/test/mocha-test-skip.js b/packages/datadog-plugin-mocha/test/mocha-test-skip.js
@@ -14,3 +14,9 @@ describe('mocha-test-skip-different', () => {
     expect(true).to.equal(false)
   })
 })
+
+describe('mocha-test-programmatic-skip', () => {
+  it('can skip too', function () {
+    this.skip()
+  })
+})