EPMRPP-84449 || crf

Author: maria-hambardzumian

__tests__/report-portal-client.spec.js

@@ -876,14 +876,14 @@ describe('ReportPortal javascript client', () => {
     });
   });
 
-  it('should automatically add NOT_ISSUE when status is SKIPPED and skippedIssue is false', function (done) {
+  it('should automatically add NOT_ISSUE when status is SKIPPED and skippedIsNotIssue is true', function (done) {
     const mockClient = new RPClient(
       {
         apiKey: 'test',
         endpoint: 'https://reportportal-stub-url',
         launch: 'test launch',
         project: 'test project',
-        skippedIssue: false,
+        skippedIsNotIssue: true,
       },
       { name: 'test', version: '1.0.0' },
     );
@@ -920,14 +920,54 @@ describe('ReportPortal javascript client', () => {
     }, 50);
   });
 
-  it('should not add NOT_ISSUE when status is SKIPPED and skippedIssue is true', function (done) {
+  it('should support legacy skippedIssue config option', function (done) {
+    const mockClient = new RPClient(
+      {
+        apiKey: 'test',
+        endpoint: 'https://reportportal-stub-url',
+        launch: 'test launch',
+        project: 'test project',
+        skippedIssue: false,
+      },
+      { name: 'test', version: '1.0.0' },
+    );
+
+    const spyFinishTestItemPromiseStart = jest
+      .spyOn(mockClient, 'finishTestItemPromiseStart')
+      .mockImplementation(() => {});
+
+    mockClient.map = {
+      testItemId: {
+        children: [],
+        finishSend: false,
+        promiseFinish: Promise.resolve(),
+        resolveFinish: () => {},
+      },
+    };
+
+    mockClient.finishTestItem('testItemId', { status: 'skipped' });
+
+    setTimeout(() => {
+      expect(spyFinishTestItemPromiseStart).toHaveBeenCalledWith(
+        expect.any(Object),
+        'testItemId',
+        expect.objectContaining({
+          status: 'skipped',
+          issue: { issueType: 'NOT_ISSUE' },
+        }),
+      );
+      done();
+    }, 50);
+  });
+
+  it('should not add NOT_ISSUE when status is SKIPPED and skippedIsNotIssue is false', function (done) {
     const mockClient = new RPClient(
       {
         apiKey: 'test',
         endpoint: 'https://reportportal-stub-url',
         launch: 'test launch',
         project: 'test project',
-        skippedIssue: true,
+        skippedIsNotIssue: false,
       },
       { name: 'test', version: '1.0.0' },
     );

index.d.ts

@@ -155,7 +155,7 @@ declare module '@reportportal/client-javascript' {
     launchUuidPrintOutput?: string;
     restClientConfig?: RestClientConfig;
     token?: string;
-    skippedIssue?: boolean;
+    skippedIsNotIssue?: boolean;
     /**
      * OAuth 2.0 configuration object. When provided, OAuth authentication will be used instead of API key.
      */

lib/commons/config.js

@@ -115,7 +115,7 @@ const getClientConfig = (options) => {
       description: options.description,
       launchUuidPrint: options.launchUuidPrint,
       launchUuidPrintOutput,
-      skippedIssue: options.skippedIssue,
+      skippedIsNotIssue: !!options.skippedIsNotIssue,
     };
   } catch (error) {
     // don't throw the error up to not break the entire process

lib/report-portal-client.js

@@ -201,6 +201,14 @@ class RPClient {
       this.launchUuid = launchDataRQ.id;
     } else {
       const systemAttr = helpers.getSystemAttribute();
+      if (this.config.skippedIsNotIssue === true) {
+        const skippedIsNotIssueAttribute = {
+          key: 'skippedIssue',
+          value: 'false',
+          system: true,
+        };
+        systemAttr.push(skippedIsNotIssueAttribute);
+      }
       const attributes = Array.isArray(launchDataRQ.attributes)
         ? launchDataRQ.attributes.concat(systemAttr)
         : systemAttr;
@@ -610,8 +618,11 @@ class RPClient {
       ...(itemObj.children.length ? {} : { status: RP_STATUSES.PASSED }),
       ...finishTestItemRQ,
     };
-    
-    if (finishTestItemData.status === RP_STATUSES.SKIPPED && this.config.skippedIssue === false) {
+
+    if (
+      finishTestItemData.status === RP_STATUSES.SKIPPED &&
+      this.config.skippedIsNotIssue === true
+    ) {
       finishTestItemData.issue = { issueType: 'NOT_ISSUE' };
     }