Add ne inline input

Update Dashboard

Author: VladislavKostyukevich

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 Features:
   - Update Tests to use Admin API to create preconditions -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/100)
+  - Dashboard: My open Issues -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/74)
+  - Cannot open external issue from Modal and View of Issue -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/96)
+  - Test run Bulk Delete -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/91)
 
 Bugfixes:
   - Test run View Page performance is bad -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/99)

e2e/api/base.api.ts

@@ -14,7 +14,7 @@ enum RequestType {
 export class BaseAPI {
     project: Project;
     token: string;
-    cookie: string;
+    protected cookie: string;
 
     constructor(project: Project, token: string, cookie: string = undefined) {
         this.project = project;

e2e/api/user.api.ts

@@ -5,6 +5,8 @@ import { Customer } from '../../src/app/shared/models/customer';
 import { LocalPermissions } from '../../src/app/shared/models/LocalPermissions';
 import { PermissionType } from '../helpers/project.helper';
 import { logger } from '../utils/log.util';
+import { logIn } from '../pages/login.po';
+import { browser } from 'protractor';
 
 enum Endpoints {
     project = '/project',
@@ -15,9 +17,11 @@ enum Endpoints {
 }
 
 export class UserAPI extends BaseAPI {
+    private user: User;
 
-    constructor(authCookie: string) {
+    constructor(authCookie: string, user: User) {
         super(null, null, authCookie)
+        this.user = user;
     }
 
     public async createProject(project: Project): Promise<Project> {
@@ -74,4 +78,10 @@ export class UserAPI extends BaseAPI {
     public removeProject(project: Project): Promise<string> {
         return this.sendDelete(Endpoints.project, { id: project.id });
     }
+
+    public async relogin(): Promise<void> {
+        await logIn.logInAs(this.user.user_name, this.user.password);
+        const authCookie = await browser.manage().getCookie('iio78');
+        this.cookie = decodeURIComponent(authCookie.value)
+    }
 }

e2e/elements/base.element.ts

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

e2e/elements/inlineEditor.element.ts

@@ -1,39 +1,62 @@
-import { by, ElementFinder, Locator } from 'protractor';
+import { by, ElementFinder, Locator, browser } from 'protractor';
 import { BaseElement } from './base.element';
 import { Input } from './input.element';
+import { logger } from '../utils/log.util';
 
 export class InlineEditor extends BaseElement {
 
     constructor(locatorOrElement: Locator | ElementFinder) {
         super(locatorOrElement);
     }
 
-    private inlineForm: ElementFinder = this.element.element(by.css('.inlineEditForm'));
-    private inlineFormSave: ElementFinder = this.element.element(by.css('#inline-editor-button-save'));
-    private inlineInput: Input = new Input(this.element.element(by.css('input, textarea')));
-    private link: ElementFinder = this.element.element(by.css('a'));
+    private inlineForm: ElementFinder = this.element.element(by.css('.ie-value-holder'));
+    private inlineLinkForm: ElementFinder = this.element.element(by.css('.link-holder'));
+    private inlineFormPlaceholder: ElementFinder = this.element.element(by.css('.placeholder'));
+    private editFormOpener: ElementFinder = this.element.element(by.css('.ie-edit'));
+    private editorFormSave: ElementFinder = this.element.element(by.css('.ie-save'));
+    private editorFormCancel: ElementFinder = this.element.element(by.css('.ie-cancel'));
+    private editorInput: Input = new Input(this.element.element(by.css('.ie-editor')));
+    private error: ElementFinder = this.element.element(by.css('.invalid-feedback'));
 
     public async openEditor() {
-        if (!(await this.inlineForm.isDisplayed())) {
-            return this.element.click();
+        logger.info('Opening Inline Editor');
+        if (await this.inlineForm.isDisplayed()) {
+            await browser.actions().mouseMove(this.inlineForm).perform();
+            return this.editFormOpener.click();
         }
+        logger.warn('Inline Editor is not displayed or already opened!');
     }
 
     public async accept() {
-        if (await this.inlineForm.isDisplayed()) {
-            return this.inlineFormSave.click();
+        logger.info('Saving Inline Editor');
+        if (await this.editorInput.isDisplayed()) {
+            return this.editorFormSave.click();
         }
+        logger.warn('Inline Editor is not displayed or not opened!');
+    }
+
+    public async cancel() {
+        logger.info('Cancel Inline Editor');
+        if (await this.editorInput.isDisplayed()) {
+            return this.editorFormCancel.click();
+        }
+        logger.warn('Inline Editor is not displayed or not opened!');
     }
 
     public async typeText(value: string) {
-        if (await this.inlineForm.isDisplayed()) {
-            return this.inlineInput.typeText(value);
+        logger.info('Typing into Inline Editor');
+        if (await this.editorInput.isDisplayed()) {
+            return this.editorInput.typeText(value);
         }
+        logger.warn('Inline Editor is not displayed or not opened!');
     }
 
     public async isEnabled(): Promise<boolean> {
-        await this.element.click();
-        return this.inlineForm.isDisplayed();
+        if (await this.inlineForm.isDisplayed()) {
+            await browser.actions().mouseMove(this.inlineForm).perform();
+            return this.editFormOpener.isPresent();
+        }
+        logger.warn('Inline Editor is not displayed or opened!');
     }
 
     public async changeAndSetValue(value: string) {
@@ -42,7 +65,23 @@ export class InlineEditor extends BaseElement {
         return this.accept();
     }
 
+    public async getError(){
+        return this.error.getText();
+    }
+
     public async getValue() {
-        return this.link.getText();
+        logger.warn('Getting Inline Editor value!');
+        if (await this.inlineFormPlaceholder.isPresent()) {
+            logger.warn('Inline Editor value is empty!');
+            return ''
+        }
+
+        if (await this.inlineLinkForm.isPresent()) {
+            logger.warn('Inline Editor value is a link!');
+            return this.inlineLinkForm.getAttribute('href');
+        }
+
+        logger.warn('Inline Editor value is a text!');
+        return this.inlineForm.getText();
     }
 }

e2e/helpers/project.helper.ts

@@ -48,7 +48,7 @@ export class ProjectHelper {
         try {
             await logIn.logInAs(this.admin.user_name, this.admin.password);
             const authCookie = await browser.manage().getCookie('iio78');
-            this.adminAPI = new UserAPI(decodeURIComponent(authCookie.value));
+            this.adminAPI = new UserAPI(decodeURIComponent(authCookie.value), this.admin);
             this.project = await this.adminAPI.createProject(this.project);
             const token = await this.adminAPI.createToken(this.project);
             if (permissions) {
@@ -76,7 +76,14 @@ export class ProjectHelper {
 
     public async dispose() {
         this.ifDisposed();
-        await this.adminAPI.removeProject(this.project);
+        try {
+            await this.adminAPI.removeProject(this.project);
+        } catch(err ) {
+            if((err as string).endsWith(`Credentials you've provided are not valid. Reenter please.`)) {
+                await this.adminAPI.relogin();
+                await this.adminAPI.removeProject(this.project);
+            }
+        }
         this.disposed = true;
     }
 

e2e/pages/issues/view.po/constants.ts

@@ -3,14 +3,15 @@ import { Lookup } from '../../../elements/lookup.element';
 import { Input } from '../../../elements/input.element';
 import { Autocomplete } from '../../../elements/autocomplete.element';
 import { SmartTable } from '../../../elements/smartTable.element';
+import { InlineEditor } from '../../../elements/inlineEditor.element';
 
 export const elements = {
     uniqueElement: element(by.id('issue-view')),
     resolution: new Lookup(by.id('issue-resolution')),
     save: element(by.id('save')),
     title: new Input(by.id('issue-title')),
     assignee: new Autocomplete(by.id('issue-assignee')),
-    extarnalIssue: new Input(by.id('issue-external-url')),
+    extarnalIssue: new InlineEditor(by.id('issue-external-url')),
     description: new Input(by.id('issue-description')),
     expressionError: element(by.css('#issue-expression + .invalid-feedback')),
     overlappedIssues: new SmartTable(by.id('overlapped-issues-table')),

e2e/pages/issues/view.po/index.ts

@@ -22,7 +22,7 @@ class IssuesView extends BasePage {
     }
 
     setExternalIssue(value: string): Promise<void> {
-        return elements.extarnalIssue.typeText(value);
+        return elements.extarnalIssue.changeAndSetValue(value);
     }
 
     setAssignee(fullName: string): Promise<void> {

e2e/pages/modals/issueCreate.po/constants.ts

@@ -4,6 +4,7 @@ import { Input } from '../../../elements/input.element';
 import { Lookup } from '../../../elements/lookup.element';
 import { SmartTable } from '../../../elements/smartTable.element';
 import { UiSwitch } from '../../../elements/ui-switch';
+import { InlineEditor } from '../../../elements/inlineEditor.element';
 
 const baseElement = element(by.tagName('issue-create-modal'));
 
@@ -18,7 +19,7 @@ export const elements = {
     overlappedIssues: new SmartTable(baseElement.element(by.id('overlapped-issues-table'))),
     expressionError: baseElement.element(by.css('#issue-expression + div.invalid-feedback')),
     expression: new Input(baseElement.element(by.id('issue-expression'))),
-    externalIssue: new Input(baseElement.element(by.id('issue-external-url'))),
+    externalIssue: new InlineEditor(baseElement.element(by.id('issue-external-url'))),
     addToResults: new UiSwitch(baseElement.element(by.css('#update-results'))),
     description: new Input(baseElement.element(by.id('issue-description'))),
 };

e2e/pages/modals/issueCreate.po/index.ts

@@ -48,7 +48,7 @@ class IssueCreateModal extends BasePage {
     }
 
     setExternalIssue(external_url: string): Promise<void> {
-        return elements.externalIssue.typeText(external_url);
+        return elements.externalIssue.changeAndSetValue(external_url);
     }
 
     getAssignee(): Promise<string> {