add the testRunId property to TestRunErrorFormattableAdapter (closes …

…DevExpress#4865) (DevExpress#4920)
AlexKamaev · Mar 30, 2020 · 34bce8d · 34bce8d
1 parent 755dd40
commit 34bce8d
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/src/errors/test-run/formattable-adapter.js b/src/errors/test-run/formattable-adapter.js
@@ -11,6 +11,7 @@ export default class TestRunErrorFormattableAdapter {
     constructor (err, metaInfo) {
         this.userAgent      = metaInfo.userAgent;
         this.screenshotPath = metaInfo.screenshotPath;
+        this.testRunId      = metaInfo.testRunId;
         this.testRunPhase   = metaInfo.testRunPhase;
 
         assignIn(this, err);

diff --git a/src/test-run/index.js b/src/test-run/index.js
@@ -382,6 +382,7 @@ export default class TestRun extends AsyncEventEmitter {
         return new TestRunErrorFormattableAdapter(err, {
             userAgent:      this.browserConnection.userAgent,
             screenshotPath: this.errScreenshotPath || '',
+            testRunId:      this.id,
             testRunPhase:   this.phase
         });
     }

diff --git a/test/server/test-run-error-formatting-test.js b/test/server/test-run-error-formatting-test.js
@@ -1,5 +1,6 @@
 const expect                              = require('chai').expect;
 const { pull: remove, chain, values }     = require('lodash');
+const TestRun                             = require('../../lib/test-run');
 const TEST_RUN_PHASE                      = require('../../lib/test-run/phase');
 const { TEST_RUN_ERRORS, RUNTIME_ERRORS } = require('../../lib/errors/types');
 const TestRunErrorFormattableAdapter      = require('../../lib/errors/test-run/formattable-adapter');
@@ -118,6 +119,34 @@ function assertErrorMessage (file, err) {
 
 describe('Error formatting', () => {
     describe('Errors', () => {
+        it('Base error formattable adapter properties', () => {
+            const testRunMock = TestRun.prototype;
+
+            Object.assign(testRunMock, {
+                session:           { id: 'test-run-id' },
+                browserConnection: { userAgent: 'chrome' },
+                errScreenshotPath: 'screenshot-path',
+                phase:             'test-run-phase',
+                callsite:          'callsite',
+                errs:              []
+            });
+
+            TestRun.prototype.addError.call(testRunMock, { callsite: 'callsite' });
+
+            const err = testRunMock.errs[0];
+
+            expect(err).instanceOf(TestRunErrorFormattableAdapter);
+
+            expect(err).eql({
+                userAgent:      'chrome',
+                screenshotPath: 'screenshot-path',
+                testRunId:      'test-run-id',
+                testRunPhase:   'test-run-phase',
+                callsite:       'callsite'
+            });
+        });
+
+
         it('Should format "actionIntegerOptionError" message', () => {
             assertErrorMessage('action-integer-option-error', new ActionIntegerOptionError('offsetX', '1.01'));
         });