Merge pull request #65 from aquality-automation/feature/fix_audits_feature_cannot_be_disabled

Feature/fix audits feature cannot be disabled

Author: VladislavKostyukevich

CHANGELOG.md

@@ -11,6 +11,7 @@ Bugfixes:
   - It should not be possible to delete Customer that assigned to the projects -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/9)
   - Link "View on Aquality Tracking" in report email is broken -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/30)
   - Link from the audit email notification is invalid -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/13)
+  - Audits feature is visible when disabled -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/24)
   - All available test are shown in tests list after updating Suite for some test -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/27) 
 
 ## 0.3.3 (2019-11-16)

e2e/elements/menuBar.element/index.ts

@@ -1,10 +1,12 @@
-import { by, element } from 'protractor';
+import { by, element, promise } from 'protractor';
 import { CreateOptions } from './create.options';
 import { TestsOptions } from './tests.options';
 import { UserOptions } from './user.options';
 import { AuditsOptions } from './audits.options';
 
 export class MenuBar {
+    private auditsButton = element(by.css('#Audits > a'));
+
     clickLogo() {
         return element(by.css('.navbar-brand')).click();
     }
@@ -28,7 +30,7 @@ export class MenuBar {
     }
 
     async audits() {
-        await element(by.css('#Audits > a')).click();
+        await this.auditsButton.click();
         return new AuditsOptions();
     }
 
@@ -54,4 +56,8 @@ export class MenuBar {
         await element(by.id('user-mb')).click();
         return new UserOptions();
     }
+
+    isAuditTabExists(): promise.Promise<boolean> {
+        return this.auditsButton.isPresent();
+    }
 }

e2e/pages/administration/appSettings.po/constants.ts

@@ -1,14 +1,17 @@
 import { by, element } from 'protractor';
 import { Input } from '../../../elements/input.element';
 import { LargeTextContainer } from '../../../elements/largeTextContainer';
+import { UiSwitch } from '../../../elements/ui-switch';
 
 export const baseUrl = '#/administration/global/appSettings';
 
 export const elements = {
     uniqueElement: element(by.css('#app-settings-administration.active')),
     defaultEmailPattern: new Input(by.id('defaultEmailPattern')),
     defaultEmailPatternhint: new LargeTextContainer(by.id('defaultEmailPatternHint')),
-    saveEmailSettings: element(by.id('saveEmailSettings'))
+    saveEmailSettings: element(by.id('saveEmailSettings')),
+    saveGeneralSettings: element(by.id('save-general')),
+    auditsModuleSwitch: new UiSwitch(by.id('audits-module'))
 };
 
 export const names = {

e2e/pages/administration/appSettings.po/index.ts

@@ -30,4 +30,16 @@ export class AppSettings extends AdministrationBase {
   toggleHint() {
     return elements.defaultEmailPatternhint.toggle();
   }
+
+  saveGeneralSettings() {
+    return elements.saveGeneralSettings.click();
+  }
+
+  disableAuditModule() {
+    return elements.auditsModuleSwitch.switchOff();
+  }
+
+  enableAuditModule() {
+    return elements.auditsModuleSwitch.switchOn();
+  }
 }

e2e/specs/administration/appSettings.spec.ts

@@ -26,8 +26,29 @@ describe('Full Admin Administartion User Flow', () => {
         }
     });
 
+
+    describe('Audit Module', () => {
+        it('I can disable Audit Module', async () => {
+            await userAdministration.sidebar.appSettings();
+            await appSettings.disableAuditModule();
+            await appSettings.saveGeneralSettings();
+            await appSettings.menuBar.clickLogo();
+            return expect(projectList.menuBar.isAuditTabExists()).toBe(false, 'Audit Module is not disabled!');
+        });
+
+        it('I can enable Audit Module', async () => {
+            await (await projectList.menuBar.user()).administration();
+            await userAdministration.sidebar.appSettings();
+            await appSettings.enableAuditModule();
+            await appSettings.saveGeneralSettings();
+            await appSettings.menuBar.clickLogo();
+            return expect(projectList.menuBar.isAuditTabExists()).toBe(true, 'Audit Module is not enabled!');
+        });
+    });
+
     describe('Default Email Pattern', () => {
         it('I can see closed Email Pattern Hint', async () => {
+            await (await projectList.menuBar.user()).administration();
             await userAdministration.sidebar.appSettings();
             return expect(appSettings.getHintText()).toEqual(Constants.emailHelpTextHint);
         });

src/app/app.component.ts

@@ -203,15 +203,15 @@ export class AppComponent {
 
   async getInfo() {
     this.isLogged = await this.userService.handleIsLogged(false);
-    this.globaldata.auditModule = await this.settingsService.getGeneralSettings().toPromise();
+    this.globaldata.auditModule = (await this.settingsService.getGeneralSettings().toPromise()).audits;
     if (this.isLogged && this.route.firstChild && this.route.firstChild.firstChild) {
       await this.getProjectInfo();
     }
   }
 
   async getProjectInfo() {
     this.route.firstChild.firstChild.params.subscribe(params => {
-      this.projectId = params['projectId'] ? parseInt(params['projectId'], 10) : undefined;
+      this.projectId = params.projectId ? parseInt(params.projectId, 10) : undefined;
     });
 
     if (this.projectId) {

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

@@ -1,15 +1,14 @@
 <div *ngIf="generalSettings" class="panel panel-default">
-  <div class="panel-heading">General Settings <button class="btn btn-success btn-sm pull-right panel-button"
-      (click)="saveGeneral()">Save</button></div>
+  <div class="panel-heading">General Settings
+    <button id="save-general"class="btn btn-success btn-sm pull-right panel-button" (click)="saveGeneral()">Save</button>
+  </div>
   <div class="panel-body">
     <div class="col-sm-4">
       <div class="col-sm-2 margin-y-sm">
-        <ui-switch class="pull-right" size="small" [(ngModel)]="generalSettings.audits"></ui-switch>
+        <ui-switch id="audits-module" class="pull-right" size="small" [(ngModel)]="generalSettings.audits"></ui-switch>
       </div>
       <div class="col-sm-10 no-padding margin-top-6px">
-        <label class="pull-left" [ngClass]="{
-                  'greyout':!generalSettings.audits
-              }">Audits Module</label>
+        <label class="pull-left" [ngClass]="{'greyout':!generalSettings.audits}">Audits Module</label>
       </div>
     </div>
     <div class="col-sm-4">

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

@@ -3,8 +3,8 @@ import { GeneralAppSettings, LDAPSettings, EmailSettings } from '../../../../sha
 import { ApplicationSettingsService } from '../../../../services/applicationSettings.service';
 import { SimpleRequester } from '../../../../services/simple-requester';
 import { EmailSettingsService } from '../../../../services/emailSettings.service';
-import { environment } from '../../../../../environments/environment';
 import { Constants } from './app-settings.constants';
+import { GlobalDataService } from '../../../../services/globaldata.service';
 
 @Component({
     templateUrl: 'app-settings.component.html',
@@ -20,13 +20,13 @@ export class AppSettingsComponent implements OnInit {
     public generalSettings: GeneralAppSettings;
     public ldapSettings: LDAPSettings;
     public emailSettings: EmailSettings;
-    public apiHost: string;
     public emailHelpText = Constants.emailPatternHelpText;
     public emailHelpTextHint = Constants.emailHelpTextHint;
 
     constructor(
         private appSettingService: ApplicationSettingsService,
-        private emailSettingsService: EmailSettingsService
+        private emailSettingsService: EmailSettingsService,
+        private globaldata: GlobalDataService
     ) { }
 
     async ngOnInit() {
@@ -40,14 +40,13 @@ export class AppSettingsComponent implements OnInit {
         this.setBaseURL();
     }
 
-    saveGeneral() {
-        this.appSettingService.updateGeneralSettings({
+    async saveGeneral() {
+        await this.appSettingService.updateGeneralSettings({
             id: this.generalSettings.id,
             ldap_auth: +this.generalSettings.ldap_auth,
             base_auth: +this.generalSettings.base_auth,
             audits: +this.generalSettings.audits
-        }).subscribe();
-        environment.host = this.apiHost;
+        });
     }
 
     setLdap($event) {

src/app/services/applicationSettings.service.ts

@@ -14,7 +14,7 @@ export class ApplicationSettingsService extends SimpleRequester {
   }
 
   updateGeneralSettings(generalSettings: GeneralAppSettings) {
-    return this.doPost('/settings', generalSettings).map(res => res);
+    return this.doPost('/settings', generalSettings).map(res => res).toPromise();
   }
 
   updateLDAPSettings(ldapSettings: LDAPSettings) {