Merge branch 'feature/refactor_permissions_service' into bugfix/date_filter_on_testrun_view

Author: VladislavKostyukevich

CHANGELOG.md

@@ -7,6 +7,12 @@ Features:
   - Import: Mark import as debug -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/47)
   - Milestone View: Add functionality that displays the latest results of the tests from the test runs -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/11)
   - List of predefined Resolutions -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/26)
+  - Add JUnit 5 support -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/33)
+  - Add posibility to Finish Test Run Manually -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/21)
+
+Bugfixes:
+  - Cannot remove milestone from TestRun -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/50)
+  - Refactored Permissions service
 
 Bugfixes:
   - Test Runs: Filter by Start Time date From doesn't work -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/38)

e2e/api/importer.api.ts

@@ -31,16 +31,16 @@ export class Importer {
         this.editorAPI = new EditorAPI(this.project, this.token);
     }
 
-    public async executeImport(importParameters: ImportParams, files: string[], fileNames: string[]) {
+    public async executeImport(importParameters: ImportParams, files: string[], fileNames: string[]): Promise<TestRun[]> {
         importParameters.projectId = this.project.id;
         const buildNames = fileNames.map(fileName => fileName.split('.').slice(0, -1).join('.'));
         const result = await this.doImport(importParameters, files, fileNames);
         if (!result) {
             throw Error('Import Failed!');
         }
 
-        return new Promise(async (resolve) => {
-            let imported = await this.isAllBuildsAreImported(buildNames);
+        return new Promise<TestRun[]>(async (resolve) => {
+            let imported: TestRun[]  = await this.isAllBuildsAreImported(buildNames);
             if (imported.length > 0) {
                 logger.info(`Import was finished Successfully`);
                 resolve(imported);
@@ -62,7 +62,7 @@ export class Importer {
         });
     }
 
-    public async executeCucumberImport(suiteName: string, files: object[], fileNames: string[]): Promise<any> {
+    public async executeCucumberImport(suiteName: string, files: object[], fileNames: string[]): Promise<TestRun[]> {
         const filesAsStringArray = files.map(file => JSON.stringify(file));
         return this.executeImport({
             projectId: this.project.id,

e2e/data/milestones.json

@@ -1,7 +1,4 @@
 {
-    "testRunCreation": {
-        "name": "For Test Run Creation"
-    },
     "suiteCreation": {
         "name": "For Suite Creation"
     },

e2e/data/suites.json

@@ -28,16 +28,20 @@ export class Autocomplete extends BaseElement implements WithSearch {
         return this.element.element(by.xpath(`.//*[contains(@class, "selector-suggestions")]//li[@title="${value}"]`));
     }
 
-    public getValue() {
-        return this.input.getValue();
+    public async getValue() {
+        if (await this.input.isPresent()) {
+            return this.input.getValue();
+        }
+
+        return this.disabledElement.getText();
     }
 
     public async createAndSelect(value) {
         await this.input.typeText(value);
         await this.findOption('Add').click();
     }
 
-    async isEditable() {
+    async isEnabled() {
         return !(await this.disabledElement.isPresent());
     }
 }

e2e/elements/autocomplete.element.ts

@@ -23,6 +23,10 @@ export class BaseElement {
         return this.element.isPresent();
     }
 
+    async isEnabled(): Promise<boolean> {
+        return this.element.isEnabled();
+    }
+
     async dragAndDrop(moveTo: BaseElement) {
         return browser.actions()
             .mouseDown(this.element)

e2e/elements/base.element.ts

@@ -20,7 +20,7 @@ export class PieChartBase extends BaseElement {
         super(locator);
     }
 
-    protected async clickChartSection(section: PieChartSection) {
+    protected async clickChartSection(section: PieChartSection): Promise<string> {
         await browser.executeScript(this.clickSectionScript, this.element, section.index);
         logger.info(`${section.name} section of Pie Chart was clicked.`);
         return section.name;

e2e/elements/charts/pieBase.element.ts

@@ -9,11 +9,11 @@ export class ResolutionPieChart extends PieChartBase {
         super(locator);
     }
 
-    public clickNotAssigned() {
+    public clickNotAssigned(): Promise<string> {
         return this.clickChartSection(lookupOptions.notAssigned);
     }
 
-    public clickTestIssue() {
+    public clickTestIssue(): Promise<string> {
         return this.clickChartSection(lookupOptions.testIssue);
     }
 }

e2e/elements/charts/resolution.Pie.element.ts

@@ -9,7 +9,7 @@ export class ResultPieChart extends PieChartBase {
         super(locator);
     }
 
-    public clickPassed() {
+    public clickPassed(): Promise<string> {
         return this.clickChartSection(results.passed);
     }
 }

e2e/elements/charts/resultPie.element.ts

@@ -31,6 +31,11 @@ export class InlineEditor extends BaseElement {
         }
     }
 
+    public async isEnabled(): Promise<boolean> {
+        await this.element.click();
+        return this.inlineForm.isDisplayed();
+    }
+
     public async changeAndSetValue(value: string) {
         await this.openEditor();
         await this.typeText(value);