Skip to content

Commit 3827d37

Browse files
VladislavKostyukevichVladislavKostyukevich
committed
Move Administration to Menu bar
Move Settings to Menu bar Replace logout with icon
1 parent 6cc7558 commit 3827d37

18 files changed

+92
-68
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# CHANGELOG
22

3+
## 0.3.6 (unreleased)
4+
5+
Features:
6+
- Move Administration to main Menu bar to make it more visible -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/58)
7+
8+
Bugfixes:
9+
310
## 0.3.5 (2020-02-15)
411

512
Features:
@@ -13,8 +20,6 @@ Features:
1320
Bugfixes:
1421
- Cannot remove milestone from TestRun -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/50)
1522
- Refactored Permissions service
16-
17-
Bugfixes:
1823
- Test Runs: Filter by Start Time date From doesn't work -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/38)
1924

2025
## 0.3.4 (2019-12-10)

‎e2e/elements/menuBar.element/index.ts‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { AuditsOptions } from './audits.options';
66

77
export class MenuBar {
88
private auditsButton = element(by.css('#Audits > a'));
9+
private administrationOption = element(by.id('administration-nav'));
910

1011
clickLogo() {
1112
return element(by.css('.navbar-brand')).click();
@@ -60,12 +61,23 @@ export class MenuBar {
6061
return new TestsOptions();
6162
}
6263

63-
async user() {
64-
await element(by.id('user-mb')).click();
65-
return new UserOptions();
66-
}
67-
6864
isAuditTabExists(): promise.Promise<boolean> {
6965
return this.auditsButton.isPresent();
7066
}
67+
68+
administration() {
69+
return this.administrationOption.click();
70+
}
71+
72+
isAdministrationExists() {
73+
return this.administrationOption.isPresent();
74+
}
75+
76+
editAccount() {
77+
return element(by.id('user-mb')).click();
78+
}
79+
80+
reportIssue() {
81+
return element(by.id('bug-nav')).click();
82+
}
7183
}

‎e2e/elements/menuBar.element/user.options.ts‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎e2e/helpers/project.helper.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export class ProjectHelper {
8787
}
8888

8989
private async setSteps(stepsState: boolean) {
90-
await (await projectList.menuBar.user()).administration();
90+
await projectList.menuBar.administration();
9191
await permissionsAdministration.sidebar.projectSettings();
9292
return projectSettingsAdministration.setStepsForProject(this.project, { stepsState });
9393
}
@@ -100,13 +100,13 @@ export class ProjectHelper {
100100
}
101101

102102
private async createToken(project: Project): Promise<string> {
103-
await (await projectList.menuBar.user()).administration();
103+
await projectList.menuBar.administration();
104104
await apiTokenAdministration.sidebar.apiToken();
105105
return apiTokenAdministration.generateToken(project.name);
106106
}
107107

108108
private async assigneProjectPermissions(project: Project, users: { [key: string]: User; }): Promise<void> {
109-
await (await projectList.menuBar.user()).administration();
109+
await projectList.menuBar.administration();
110110
await permissionsAdministration.sidebar.permissions();
111111
await permissionsAdministration.selectProject(project.name);
112112
const keys = Object.keys(users);

‎e2e/specs/administration/apiToken.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe('API Token:', () => {
4141
});
4242

4343
it('I can open API Token page', async () => {
44-
await (await projectList.menuBar.user()).administration();
44+
await projectList.menuBar.administration();
4545
await userAdministration.sidebar.apiToken();
4646
return expect(apiTokenAdministration.isOpened()).toBe(true, `API Token page is not opened for ${description}`);
4747
});
@@ -81,7 +81,7 @@ describe('API Token:', () => {
8181
});
8282

8383
it('I can not Open API Token page using Menu Bar', async () => {
84-
await (await projectList.menuBar.user()).administration();
84+
await projectList.menuBar.administration();
8585
return expect(apiTokenAdministration.sidebar.isApiTokenExist())
8686
.toBe(false, `API Token should not be visible for ${description}`);
8787
});

‎e2e/specs/administration/appSettings.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe('Full Admin Administartion User Flow', () => {
1111

1212
beforeAll(async () => {
1313
await logIn.logInAs(users.admin.user_name, users.admin.password);
14-
return (await projectList.menuBar.user()).administration();
14+
return projectList.menuBar.administration();
1515
});
1616

1717
afterAll(async () => {
@@ -30,7 +30,7 @@ describe('Full Admin Administartion User Flow', () => {
3030
});
3131

3232
it('I can enable Audit Module', async () => {
33-
await (await projectList.menuBar.user()).administration();
33+
await projectList.menuBar.administration();
3434
await userAdministration.sidebar.appSettings();
3535
await appSettings.enableAuditModule();
3636
await appSettings.saveGeneralSettings();
@@ -41,7 +41,7 @@ describe('Full Admin Administartion User Flow', () => {
4141

4242
describe('Default Email Pattern', () => {
4343
it('I can see closed Email Pattern Hint', async () => {
44-
await (await projectList.menuBar.user()).administration();
44+
await projectList.menuBar.administration();
4545
await userAdministration.sidebar.appSettings();
4646
return expect(appSettings.getHintText()).toEqual(Constants.emailHelpTextHint);
4747
});

‎e2e/specs/administration/permissions.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ describe('Administartion:', () => {
4848
});
4949

5050
it('I can open Permissions page', async () => {
51-
await (await projectList.menuBar.user()).administration();
51+
await projectList.menuBar.administration();
5252
await userAdministration.sidebar.permissions();
5353
return expect(permissionsAdministration.isOpened()).toBe(true, `Permissions page is not opened for ${description}`);
5454
});
@@ -109,7 +109,7 @@ describe('Administartion:', () => {
109109
});
110110

111111
it('I can not Open Permissions page using Menu Bar', async () => {
112-
await (await projectList.menuBar.user()).administration();
112+
await projectList.menuBar.administration();
113113
return expect(permissionsAdministration.sidebar.isPermissionsExist())
114114
.toBe(false, `Permissions should not be visible for ${description}`);
115115
});

‎e2e/specs/administration/predefinedResolutions.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ describe('Predefined Resolution:', () => {
6161
});
6262

6363
it('I can open Predefined Resolution page', async () => {
64-
await (await projectList.menuBar.user()).administration();
64+
await projectList.menuBar.administration();
6565
await userAdministration.sidebar.predefinedResolutions();
6666
return expect(predefinedResolutions.isOpened()).toBe(true, `Predefined Resolution page is not opened for ${description}`);
6767
});
@@ -172,7 +172,7 @@ describe('Predefined Resolution:', () => {
172172
});
173173

174174
it('I can not open Predefined Resolution page using Menu Bar', async () => {
175-
return expect((await projectList.menuBar.user()).isAdministrationExists())
175+
return expect(projectList.menuBar.isAdministrationExists())
176176
.toBe(false, `Administartion should not be visible for ${description}`);
177177
});
178178

‎e2e/specs/administration/projectSettings/projectSettings.searchPattern.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ describe('Administartion: Project Settings:', () => {
4848
beforeAll(async () => {
4949
await logIn.logInAs(localManager.user_name, localManager.password);
5050
await projectHelper.openProject();
51-
await (await projectList.menuBar.user()).administration();
51+
await projectList.menuBar.administration();
5252
await userAdministration.sidebar.projectSettings();
5353
await projectHelper.importer.executeCucumberImport('Regex', [importFiles.firstError], [`${builds.build_1}.json`]);
5454
});

‎e2e/specs/administration/projectSettings/projectSettings.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ describe('Administartion: Project Settings:', () => {
4343
});
4444

4545
it('I can open Project Settings page', async () => {
46-
await (await projectList.menuBar.user()).administration();
46+
await projectList.menuBar.administration();
4747
await userAdministration.sidebar.projectSettings();
4848
return expect(projectSettingsAdministration.isOpened())
4949
.toBe(true, `Project Settings page is not opened for ${description}`);
@@ -87,7 +87,7 @@ describe('Administartion: Project Settings:', () => {
8787
});
8888

8989
it('I can not Open Project Settings page using Menu Bar', async () => {
90-
await (await projectList.menuBar.user()).administration();
90+
await projectList.menuBar.administration();
9191
return expect(projectSettingsAdministration.sidebar.isProjectSettingsExist())
9292
.toBe(false, `Project Settings should not be visible for ${description}`);
9393
});

0 commit comments

Comments
 (0)