cypress-qase-reporter 2.2.0-beta.1 → 2.2.0-beta.3

package/README.md

@@ -106,6 +106,7 @@ parameterize your tests.
 - `qase.parameters` - set the parameters of the test case
 - `qase.groupParameters` - set the group parameters of the test case
 - `qase.ignore` - ignore the test case in Qase. The test will be executed, but the results will not be sent to Qase.
+- `qase.step` - create a step in the test case
 
 For example:
 
@@ -206,8 +207,8 @@ module.exports = cypress.defineConfig({
   video: false,
   e2e: {
     setupNodeEvents(on, config) {
-       require('cypress-qase-reporter/plugin')(on, config)
-       require('cypress-qase-reporter/metadata')(on)
+      require('cypress-qase-reporter/plugin')(on, config)
+      require('cypress-qase-reporter/metadata')(on)
     },
   },
 });

package/changelog.md

@@ -1,3 +1,37 @@
+# cypress-qase-reporter@2.2.0-beta.3
+
+## What's new
+
+Added the ability to add attachments to tests or steps:
+
+- `qase.attach` - add an attachment to test or step
+
+```ts
+it('test', () => {
+  qase.attach({ paths: '/path/to/file' });
+  qase.step('Step 1', () => {
+    cy.visit('https://example.com');
+    qase.attach({ name: 'attachment.txt', content: 'Hello, world!', contentType: 'text/plain' });
+  });
+});
+```
+
+# cypress-qase-reporter@2.2.0-beta.2
+
+## What's new
+
+Added the ability to add steps in tests:
+
+- `qase.step` - add a step to the test
+
+```ts
+it('test', () => {
+  qase.step('Step 1', () => {
+    cy.visit('https://example.com');
+  });
+});
+```
+
 # cypress-qase-reporter@2.2.0-beta.1
 
 ## What's new

package/dist/metadata/manager.d.ts

@@ -1,7 +1,11 @@
-import { Metadata } from './models';
+import { Attach, Metadata } from './models';
+import { Attachment } from 'qase-javascript-commons';
 export declare class MetadataManager {
     static getMetadata(): Metadata | undefined;
     static setIgnore(): void;
+    static addStepStart(name: string): void;
+    static addStepEnd(status: string): void;
+    static addAttach(attach: Attach): void;
     static setSuite(suite: string): void;
     static setComment(comment: string): void;
     static setTitle(title: string): void;
@@ -11,4 +15,5 @@ export declare class MetadataManager {
     private static setMetadata;
     static clear(): void;
     static isExists(): boolean;
+    static prepareAttach(attach: Attach): Attachment[];
 }

package/dist/metadata/manager.js

@@ -1,7 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MetadataManager = void 0;
 const fs_1 = require("fs");
+const uuid_1 = require("uuid");
+const path_1 = __importDefault(require("path"));
+const qase_javascript_commons_1 = require("qase-javascript-commons");
 const metadataPath = 'qaseMetadata';
 // eslint-disable-next-line @typescript-eslint/no-extraneous-class
 class MetadataManager {
@@ -17,6 +23,11 @@ class MetadataManager {
             ignore: false,
             suite: undefined,
             comment: undefined,
+            steps: [],
+            currentStepId: undefined,
+            firstStepName: undefined,
+            attachments: [],
+            stepAttachments: {},
         };
         try {
             const data = (0, fs_1.readFileSync)(metadataPath, 'utf8');
@@ -33,6 +44,55 @@ class MetadataManager {
         metadata.ignore = true;
         this.setMetadata(metadata);
     }
+    static addStepStart(name) {
+        const metadata = this.getMetadata() ?? {};
+        if (metadata.firstStepName === name) {
+            return;
+        }
+        if (!metadata.steps) {
+            metadata.steps = [];
+        }
+        const id = (0, uuid_1.v4)();
+        const parentId = metadata.currentStepId ?? undefined;
+        metadata.steps.push({ timestamp: Date.now(), name, id: id, parentId: parentId });
+        metadata.currentStepId = id;
+        if (!metadata.firstStepName) {
+            metadata.firstStepName = name;
+        }
+        this.setMetadata(metadata);
+    }
+    static addStepEnd(status) {
+        const metadata = this.getMetadata() ?? {};
+        if (!metadata.steps || !metadata.currentStepId) {
+            return;
+        }
+        const parentId = metadata.steps.reverse().find((step) => step.id === metadata.currentStepId)?.parentId;
+        metadata.steps.push({ timestamp: Date.now(), status, id: metadata.currentStepId });
+        metadata.currentStepId = parentId;
+        this.setMetadata(metadata);
+    }
+    static addAttach(attach) {
+        const metadata = this.getMetadata() ?? {};
+        if (!metadata.attachments) {
+            metadata.attachments = [];
+        }
+        if (!metadata.stepAttachments) {
+            metadata.stepAttachments = {};
+        }
+        const attachments = this.prepareAttach(attach);
+        if (metadata.currentStepId) {
+            if (metadata.stepAttachments[metadata.currentStepId] === undefined) {
+                metadata.stepAttachments[metadata.currentStepId] = attachments;
+            }
+            else {
+                metadata.stepAttachments[metadata.currentStepId]?.push(...attachments);
+            }
+        }
+        else {
+            metadata.attachments.push(...attachments);
+        }
+        this.setMetadata(metadata);
+    }
     static setSuite(suite) {
         const metadata = this.getMetadata() ?? {};
         metadata.suite = suite;
@@ -86,5 +146,47 @@ class MetadataManager {
     static isExists() {
         return (0, fs_1.existsSync)(metadataPath);
     }
+    static prepareAttach(attach) {
+        const attachments = [];
+        if (attach.paths) {
+            if (Array.isArray(attach.paths)) {
+                attach.paths.forEach((file) => {
+                    const attachmentName = path_1.default.basename(file);
+                    const contentType = (0, qase_javascript_commons_1.getMimeTypes)(file);
+                    attachments.push({
+                        file_name: attachmentName,
+                        mime_type: contentType,
+                        file_path: file,
+                        content: '',
+                        size: 0,
+                        id: (0, uuid_1.v4)(),
+                    });
+                });
+            }
+            else {
+                const attachmentName = path_1.default.basename(attach.paths);
+                const contentType = (0, qase_javascript_commons_1.getMimeTypes)(attach.paths);
+                attachments.push({
+                    file_name: attachmentName,
+                    mime_type: contentType,
+                    file_path: attach.paths,
+                    content: '',
+                    size: 0,
+                    id: (0, uuid_1.v4)(),
+                });
+            }
+        }
+        else if (attach.content) {
+            attachments.push({
+                file_name: attach.name ?? 'attachment',
+                mime_type: attach.contentType ?? 'application/octet-stream',
+                file_path: null,
+                content: attach.content,
+                size: 0,
+                id: (0, uuid_1.v4)(),
+            });
+        }
+        return attachments;
+    }
 }
 exports.MetadataManager = MetadataManager;

package/dist/metadata/models.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import { Attachment } from 'qase-javascript-commons';
 export interface Metadata {
     title?: string | undefined;
     fields?: Record<string, string>;
@@ -6,4 +8,26 @@ export interface Metadata {
     ignore?: boolean;
     suite?: string | undefined;
     comment?: string | undefined;
+    steps?: (StepStart | StepEnd)[];
+    currentStepId?: string | undefined;
+    firstStepName?: string | undefined;
+    attachments?: Attachment[];
+    stepAttachments?: Record<string, Attachment[]>;
+}
+export interface StepStart {
+    id: string;
+    timestamp: number;
+    name: string;
+    parentId: string | undefined;
+}
+export interface StepEnd {
+    id: string;
+    timestamp: number;
+    status: string;
+}
+export interface Attach {
+    name?: string;
+    paths?: string | string[];
+    content?: Buffer | string;
+    contentType?: string;
 }

package/dist/metadata.js

@@ -44,4 +44,22 @@ module.exports = function (on) {
             return null;
         },
     });
+    on('task', {
+        qaseStepStart(value) {
+            manager_1.MetadataManager.addStepStart(value);
+            return null;
+        },
+    });
+    on('task', {
+        qaseStepEnd(value) {
+            manager_1.MetadataManager.addStepEnd(value);
+            return null;
+        },
+    });
+    on('task', {
+        qaseAttach(value) {
+            manager_1.MetadataManager.addAttach(value);
+            return null;
+        },
+    });
 };

package/dist/mocha.d.ts

@@ -1,4 +1,8 @@
 /// <reference types="cypress" />
+/// <reference types="cypress" />
+/// <reference types="cypress" />
+/// <reference types="cypress" />
+/// <reference types="node" />
 import { Test } from 'mocha';
 export declare const qase: {
     (caseId: number | string | number[] | string[], test: Test): Test;
@@ -11,7 +15,7 @@ export declare const qase: {
      *    cy.visit('https://example.com');
      * });
      */
-    title(value: string): void;
+    title(value: string): Cypress.Chainable<JQuery<void>>;
     /**
      * Set fields for the test case
      * @param {Record<string, string>} values
@@ -21,7 +25,7 @@ export declare const qase: {
      *    cy.visit('https://example.com');
      * });
      */
-    fields(values: Record<string, string>): void;
+    fields(values: Record<string, string>): Cypress.Chainable<JQuery<void>>;
     /**
      * Ignore the test case result in Qase
      * @example
@@ -30,7 +34,7 @@ export declare const qase: {
      *    cy.visit('https://example.com');
      * });
      */
-    ignore(): void;
+    ignore(): Cypress.Chainable<JQuery<void>>;
     /**
      * Set parameters for the test case
      * @param {Record<string, string>} values
@@ -40,7 +44,7 @@ export declare const qase: {
      *    cy.visit('https://example.com');
      * });
      */
-    parameters(values: Record<string, string>): void;
+    parameters(values: Record<string, string>): Cypress.Chainable<JQuery<void>>;
     /**
      * Set group parameters for the test case
      * @param {Record<string, string>} values
@@ -50,7 +54,7 @@ export declare const qase: {
      *    cy.visit('https://example.com');
      * });
      */
-    groupParameters(values: Record<string, string>): void;
+    groupParameters(values: Record<string, string>): Cypress.Chainable<JQuery<void>>;
     /**
      * Set a suite for the test case
      * @param {string} value
@@ -60,7 +64,7 @@ export declare const qase: {
      *    cy.visit('https://example.com');
      * });
      */
-    suite(value: string): void;
+    suite(value: string): Cypress.Chainable<JQuery<void>>;
     /**
      * Set a comment for the test case
      * @param {string} value
@@ -70,5 +74,35 @@ export declare const qase: {
      *    cy.visit('https://example.com');
      * });
      */
-    comment(value: string): void;
+    comment(value: string): Cypress.Chainable<JQuery<void>>;
+    /**
+     * Add a step to  the test case
+     * @param {string} name
+     * @param {() => T | PromiseLike<T>} body
+     * @example
+     * it('test', () => {
+     *    qase.step("Some step", () => {
+     *      // some actions
+     *    });
+     *    cy.visit('https://example.com');
+     * });
+     */
+    step<T = void>(name: string, body: () => T | PromiseLike<T>): Cypress.Chainable<JQuery<void>>;
+    /**
+     * Attach a file to the test case or the step
+     * @param attach
+     * @example
+     * it('test', () => {
+     *   qase.attach({ name: 'attachment.txt', content: 'Hello, world!', contentType: 'text/plain' });
+     *   qase.attach({ paths: '/path/to/file'});
+     *   qase.attach({ paths: ['/path/to/file', '/path/to/another/file']});
+     *   cy.visit('https://example.com');
+     *  });
+     */
+    attach(attach: {
+        name?: string;
+        paths?: string | string[];
+        content?: Buffer | string;
+        contentType?: string;
+    }): Cypress.Chainable<JQuery<void>>;
 };

package/dist/mocha.js

@@ -17,7 +17,7 @@ exports.qase = qase;
  * });
  */
 exports.qase.title = (value) => {
-    cy.task('qaseTitle', value).then(() => {
+    return cy.task('qaseTitle', value).then(() => {
         //
     });
 };
@@ -31,7 +31,7 @@ exports.qase.title = (value) => {
  * });
  */
 exports.qase.fields = (values) => {
-    cy.task('qaseFields', values).then(() => {
+    return cy.task('qaseFields', values).then(() => {
         //
     });
 };
@@ -44,7 +44,7 @@ exports.qase.fields = (values) => {
  * });
  */
 exports.qase.ignore = () => {
-    cy.task('qaseIgnore').then(() => {
+    return cy.task('qaseIgnore').then(() => {
         //
     });
 };
@@ -58,7 +58,7 @@ exports.qase.ignore = () => {
  * });
  */
 exports.qase.parameters = (values) => {
-    cy.task('qaseParameters', values).then(() => {
+    return cy.task('qaseParameters', values).then(() => {
         //
     });
 };
@@ -72,7 +72,7 @@ exports.qase.parameters = (values) => {
  * });
  */
 exports.qase.groupParameters = (values) => {
-    cy.task('qaseGroupParameters', values).then(() => {
+    return cy.task('qaseGroupParameters', values).then(() => {
         //
     });
 };
@@ -86,7 +86,7 @@ exports.qase.groupParameters = (values) => {
  * });
  */
 exports.qase.suite = (value) => {
-    cy.task('qaseSuite', value).then(() => {
+    return cy.task('qaseSuite', value).then(() => {
         //
     });
 };
@@ -100,7 +100,44 @@ exports.qase.suite = (value) => {
  * });
  */
 exports.qase.comment = (value) => {
-    cy.task('qaseComment', value).then(() => {
+    return cy.task('qaseComment', value).then(() => {
+        //
+    });
+};
+/**
+ * Add a step to  the test case
+ * @param {string} name
+ * @param {() => T | PromiseLike<T>} body
+ * @example
+ * it('test', () => {
+ *    qase.step("Some step", () => {
+ *      // some actions
+ *    });
+ *    cy.visit('https://example.com');
+ * });
+ */
+exports.qase.step = (name, body) => {
+    return cy.task('qaseStepStart', name).then(() => {
+        return Cypress.Promise.resolve(body());
+    }).then(() => {
+        cy.task('qaseStepEnd', 'passed').then(() => {
+            //
+        });
+    });
+};
+/**
+ * Attach a file to the test case or the step
+ * @param attach
+ * @example
+ * it('test', () => {
+ *   qase.attach({ name: 'attachment.txt', content: 'Hello, world!', contentType: 'text/plain' });
+ *   qase.attach({ paths: '/path/to/file'});
+ *   qase.attach({ paths: ['/path/to/file', '/path/to/another/file']});
+ *   cy.visit('https://example.com');
+ *  });
+ */
+exports.qase.attach = (attach) => {
+    return cy.task('qaseAttach', attach).then(() => {
         //
     });
 };

package/dist/reporter.d.ts

@@ -70,5 +70,6 @@ export declare class CypressQaseReporter extends reporters.Base {
      * @private
      */
     private getFile;
+    private getSteps;
 }
 export {};

package/dist/reporter.js

@@ -107,6 +107,7 @@ class CypressQaseReporter extends mocha_1.reporters.Base {
         const attachments = this.screenshotsFolder
             ? CypressQaseReporter.findAttachments(ids, this.screenshotsFolder)
             : undefined;
+        attachments?.push(...(metadata?.attachments ?? []));
         let relations = {};
         if (test.parent !== undefined) {
             const data = [];
@@ -155,7 +156,7 @@ class CypressQaseReporter extends mocha_1.reporters.Base {
             relations: relations,
             run_id: null,
             signature: this.getSignature(test, ids),
-            steps: [],
+            steps: metadata?.steps ? this.getSteps(metadata.steps, metadata.stepAttachments ?? {}) : [],
             id: (0, uuid_1.v4)(),
             execution: {
                 status: test.state
@@ -208,6 +209,46 @@ class CypressQaseReporter extends mocha_1.reporters.Base {
         }
         return undefined;
     }
+    getSteps(steps, attachments) {
+        const result = [];
+        const stepMap = new Map();
+        for (const step of steps.sort((a, b) => a.timestamp - b.timestamp)) {
+            if (!('status' in step)) {
+                const newStep = new qase_javascript_commons_1.TestStepType();
+                newStep.id = step.id;
+                newStep.execution.status = qase_javascript_commons_1.StepStatusEnum.failed;
+                newStep.execution.start_time = step.timestamp;
+                newStep.execution.end_time = Date.now();
+                newStep.data = {
+                    action: step.name,
+                    expected_result: null,
+                };
+                if (attachments[step.id]) {
+                    newStep.attachments = attachments[step.id] ?? [];
+                }
+                const parentId = step.parentId;
+                if (parentId) {
+                    newStep.parent_id = parentId;
+                    const parent = stepMap.get(parentId);
+                    if (parent) {
+                        parent.steps.push(newStep);
+                    }
+                }
+                else {
+                    result.push(newStep);
+                }
+                stepMap.set(step.id, newStep);
+            }
+            else {
+                const stepType = stepMap.get(step.id);
+                if (stepType) {
+                    stepType.execution.status = step.status;
+                    stepType.execution.end_time = step.timestamp;
+                }
+            }
+        }
+        return result;
+    }
 }
 exports.CypressQaseReporter = CypressQaseReporter;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress-qase-reporter",
-  "version": "2.2.0-beta.1",
+  "version": "2.2.0-beta.3",
   "description": "Qase Cypress Reporter",
   "homepage": "https://github.com/qase-tms/qase-javascript",
   "sideEffects": false,