Skip to content

Commit 7b26bc6

Browse files
fix users for init
1 parent a7e7ceb commit 7b26bc6

File tree

10 files changed

+32
-22
lines changed

10 files changed

+32
-22
lines changed

e2e/specs/administration/apiToken.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { apiTokenAdministration } from '../../pages/administration/apiToken.po';
88
import { notFound } from '../../pages/notFound.po';
99

1010
const editorExamples = {
11-
admin: usersTestData.autoAdmin,
11+
autoAdmin: usersTestData.autoAdmin,
1212
localAdmin: usersTestData.localAdmin,
1313
localManager: usersTestData.localManager,
1414
manager: usersTestData.manager
@@ -23,6 +23,8 @@ describe('API Token:', () => {
2323

2424
beforeAll(async () => {
2525
await projectHelper.init({
26+
autoAdmin: usersTestData.autoAdmin,
27+
manager: usersTestData.manager,
2628
localAdmin: usersTestData.localAdmin,
2729
localManager: usersTestData.localManager,
2830
localEngineer: usersTestData.localEngineer

e2e/specs/administration/appSettings.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ describe('Full Admin Administartion User Flow', () => {
1010
const userToCreate: User = users.patternTest;
1111

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

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { notFound } from '../../../pages/notFound.po';
1414
import { Issue } from '../../../../src/app/shared/models/issue';
1515

1616
const editorExamples = {
17-
admin: usersTestData.autoAdmin,
17+
autoAdmin: usersTestData.autoAdmin,
1818
localAdmin: usersTestData.localAdmin,
1919
localManager: usersTestData.localManager,
2020
manager: usersTestData.manager
@@ -31,10 +31,14 @@ describe('Administartion: Project Settings:', () => {
3131
describe(`Permissions: ${description} role:`, () => {
3232

3333
beforeAll(async () => {
34-
const projectUsers = {};
35-
projectUsers[description] = user;
3634
projectHelper = new ProjectHelper();
37-
await projectHelper.init(projectUsers);
35+
await projectHelper.init({
36+
autoAdmin: usersTestData.autoAdmin,
37+
localAdmin: usersTestData.localAdmin,
38+
localManager: usersTestData.localManager,
39+
manager: usersTestData.manager,
40+
localEngineer: usersTestData.localEngineer,
41+
});
3842
await logIn.logInAs(user.user_name, user.password);
3943
return projectHelper.openProject();
4044
});

e2e/specs/administration/resolutions.spec.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import resolutions from '../../data/resolutions.json';
1616

1717

1818
const editorExamples = {
19-
admin: usersTestData.autoAdmin,
19+
autoAdmin: usersTestData.autoAdmin,
2020
localAdmin: usersTestData.localAdmin,
2121
localManager: usersTestData.localManager,
2222
manager: usersTestData.manager
@@ -36,14 +36,18 @@ describe('Administartion: Custom Resolution:', () => {
3636

3737
beforeAll(async () => {
3838
await baseProjectHelper.init({
39+
autoAdmin: usersTestData.autoAdmin,
3940
localAdmin: usersTestData.localAdmin,
4041
localManager: usersTestData.localManager,
41-
localEngineer: usersTestData.localEngineer
42+
localEngineer: usersTestData.localEngineer,
43+
manager: usersTestData.manager
4244
});
4345
await extraProjectHelper.init({
46+
autoAdmin: usersTestData.autoAdmin,
4447
localAdmin: usersTestData.localAdmin,
4548
localManager: usersTestData.localManager,
46-
localEngineer: usersTestData.localEngineer
49+
localEngineer: usersTestData.localEngineer,
50+
manager: usersTestData.manager
4751
});
4852
issueExisting = await baseProjectHelper.editorAPI.createIssue(issueExisting);
4953
});

e2e/specs/administration/user.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { userAdministration } from '../../pages/administration/users.po';
55
import { projectList } from '../../pages/project/list.po';
66
import { browser } from 'protractor';
77

8-
describe('Full Admin Administartion User Flow', () => {
8+
fdescribe('Full Admin Administartion User Flow', () => {
99
const userToCreate: User = users.creationTest;
1010

1111
const validateUser = async () => {
@@ -31,7 +31,7 @@ describe('Full Admin Administartion User Flow', () => {
3131
};
3232

3333
beforeAll(async () => {
34-
await logIn.logInAs(users.autoAdmin.user_name, users.autoAdmin.password);
34+
await logIn.logInAs(users.admin.user_name, users.admin.password);
3535
return projectList.menuBar.administration();
3636
});
3737

@@ -99,7 +99,7 @@ describe('Full Admin Administartion User Flow', () => {
9999
await logIn.logInAs(userToCreate.user_name, userToCreate.password);
100100
await expect(projectList.isOpened()).toBe(true, 'New user is not able to log in');
101101
await projectList.menuBar.clickLogOut();
102-
await logIn.logInAs(users.autoAdmin.user_name, users.autoAdmin.password);
102+
await logIn.logInAs(users.admin.user_name, users.admin.password);
103103
return projectList.menuBar.administration();
104104
});
105105
});
@@ -164,7 +164,7 @@ describe('Full Admin Administartion User Flow', () => {
164164
await logIn.logInAs(userToCreate.user_name, userToCreate.password);
165165
await expect(projectList.isOpened()).toBe(true, 'New user is not able to log in');
166166
await projectList.menuBar.clickLogOut();
167-
await logIn.logInAs(users.autoAdmin.user_name, users.autoAdmin.password);
167+
await logIn.logInAs(users.admin.user_name, users.admin.password);
168168
return projectList.menuBar.administration();
169169
});
170170
});

e2e/specs/login.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ describe('Log in', () => {
1414
});
1515

1616
it('should be able to login as admin', async () => {
17-
await logIn.setUserName(users.autoAdmin.user_name);
18-
await logIn.setPassword(users.autoAdmin.password);
17+
await logIn.setUserName(users.admin.user_name);
18+
await logIn.setPassword(users.admin.password);
1919
await logIn.clickLogIn();
2020
return expect(logIn.menuBar.isLogged()).toBe(true);
2121
});
2222

2323
it('should not be able to login with wrong username', async () => {
2424
await logIn.setUserName('admin1');
25-
await logIn.setPassword(users.autoAdmin.password);
25+
await logIn.setPassword(users.admin.password);
2626
await logIn.clickLogIn();
2727
await expect(logIn.menuBar.isLogged()).toBe(false);
2828
return logIn.notification.assertIsError();
2929
});
3030

3131
it('should not be able to login with wrong password', async () => {
32-
await logIn.setUserName(users.autoAdmin.user_name);
32+
await logIn.setUserName(users.admin.user_name);
3333
await logIn.setPassword('1234567');
3434
await logIn.clickLogIn();
3535
await expect(logIn.menuBar.isLogged()).toBe(false);

e2e/specs/menu.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ describe('Report an Issue', () => {
77
const githubUrl = 'https://github.com/aquality-automation/aquality-tracking/issues';
88

99
beforeAll(async () => {
10-
await logIn.logInAs(users.autoAdmin.user_name, users.autoAdmin.password);
10+
await logIn.logInAs(users.admin.user_name, users.admin.password);
1111
});
1212

1313
afterAll(async () => {

e2e/specs/steps/steps.spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ describe('Steps:', () => {
2424

2525
beforeAll(async () => {
2626
return projectHelper.init({
27-
admin: usersTestData.autoAdmin,
2827
localAdmin: usersTestData.localAdmin,
2928
localManager: usersTestData.localManager,
3029
localEngineer: usersTestData.localEngineer,

e2e/specs/suite/syncSuite.spec.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,13 @@ describe('Sync Test Suite', () => {
5151

5252
beforeAll(async () => {
5353
return projectHelper.init({
54-
admin: users.autoAdmin,
5554
localAdmin: users.localAdmin,
5655
localManager: users.localManager,
5756
localEngineer: users.localEngineer,
58-
viewer: users.viewer
57+
manager: users.manager,
58+
viewer: users.viewer,
59+
audit_admin: users.auditAdmin,
60+
auditor: users.assignedAuditor
5961
});
6062
});
6163

e2e/specs/test/test.steps.spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ describe('Test Steps:', () => {
3737

3838
beforeAll(async () => {
3939
await projectHelper.init({
40-
admin: usersTestData.autoAdmin,
4140
localAdmin: usersTestData.localAdmin,
4241
localManager: usersTestData.localManager,
4342
localEngineer: usersTestData.localEngineer,

0 commit comments

Comments
 (0)