Merge branch 'feature/public_api_tests' into feature/add_possibility_to_filter_by_inactive_milestone

Author: VladislavKostyukevich

e2e/specs/hooks.spec.ts

@@ -22,18 +22,18 @@ beforeAll(async () => {
         throw new Error(`Backend is unavailable ${environment.host}`);
     }
     await logIn.navigateTo();
-    // await logIn.logInAs(usersTestData.admin.user_name, usersTestData.admin.password);
-    // await projectList.menuBar.administration();
-    // await userAdministration.create(usersTestData.autoAdmin);
-    // await userAdministration.create(usersTestData.localAdmin);
-    // await userAdministration.create(usersTestData.auditAdmin);
-    // await userAdministration.create(usersTestData.assignedAuditor);
-    // await userAdministration.create(usersTestData.localManager);
-    // await userAdministration.create(usersTestData.localEngineer);
-    // await userAdministration.create(usersTestData.manager);
-    // await userAdministration.create(usersTestData.projectTemp);
-    // await userAdministration.create(usersTestData.viewer);
-    // await userAdministration.menuBar.clickLogOut();
+    await logIn.logInAs(usersTestData.admin.user_name, usersTestData.admin.password);
+    await projectList.menuBar.administration();
+    await userAdministration.create(usersTestData.autoAdmin);
+    await userAdministration.create(usersTestData.localAdmin);
+    await userAdministration.create(usersTestData.auditAdmin);
+    await userAdministration.create(usersTestData.assignedAuditor);
+    await userAdministration.create(usersTestData.localManager);
+    await userAdministration.create(usersTestData.localEngineer);
+    await userAdministration.create(usersTestData.manager);
+    await userAdministration.create(usersTestData.projectTemp);
+    await userAdministration.create(usersTestData.viewer);
+    await userAdministration.menuBar.clickLogOut();
 });
 
 beforeEach(async () => {
@@ -44,14 +44,14 @@ beforeEach(async () => {
 });
 
 afterAll(async () => {
-    // await logIn.logInAs(usersTestData.admin.user_name, usersTestData.admin.password);
-    // await projectList.menuBar.administration();
-    // await userAdministration.remove(usersTestData.localAdmin.user_name);
-    // await userAdministration.remove(usersTestData.autoAdmin.user_name);
-    // await userAdministration.remove(usersTestData.localManager.user_name);
-    // await userAdministration.remove(usersTestData.localEngineer.user_name);
-    // await userAdministration.remove(usersTestData.manager.user_name);
-    // await userAdministration.remove(usersTestData.projectTemp.user_name);
-    // await userAdministration.remove(usersTestData.viewer.user_name);
-    // await userAdministration.menuBar.clickLogOut();
+    await logIn.logInAs(usersTestData.admin.user_name, usersTestData.admin.password);
+    await projectList.menuBar.administration();
+    await userAdministration.remove(usersTestData.localAdmin.user_name);
+    await userAdministration.remove(usersTestData.autoAdmin.user_name);
+    await userAdministration.remove(usersTestData.localManager.user_name);
+    await userAdministration.remove(usersTestData.localEngineer.user_name);
+    await userAdministration.remove(usersTestData.manager.user_name);
+    await userAdministration.remove(usersTestData.projectTemp.user_name);
+    await userAdministration.remove(usersTestData.viewer.user_name);
+    await userAdministration.menuBar.clickLogOut();
 });

src/app/pages/administration/global/app-settings/app-settings.component.ts

@@ -25,8 +25,7 @@ export class AppSettingsComponent implements OnInit {
 
     constructor(
         private appSettingService: ApplicationSettingsService,
-        private emailSettingsService: EmailSettingsService,
-        private globaldata: GlobalDataService
+        private emailSettingsService: EmailSettingsService
     ) { }
 
     async ngOnInit() {
@@ -47,6 +46,7 @@ export class AppSettingsComponent implements OnInit {
             base_auth: +this.generalSettings.base_auth,
             audits: +this.generalSettings.audits
         });
+        this.appSettingService.handleSuccess('General settings were saved!');
     }
 
     setLdap($event) {
@@ -58,8 +58,9 @@ export class AppSettingsComponent implements OnInit {
         }
     }
 
-    saveLDAP() {
-        this.appSettingService.updateLDAPSettings(this.ldapSettings).subscribe();
+    async saveLDAP() {
+        await this.appSettingService.updateLDAPSettings(this.ldapSettings).toPromise();
+        this.appSettingService.handleSuccess('LDAP settings were saved!');
     }
 
     saveEmail() {