Merge branch 'master' of github.com:microting/eform-angular-frontend

Author: renemadsen

eform-client/e2e/Constants/LoginConstants.ts

@@ -1,4 +1,5 @@
 export default {
   username: '[email protected]',
-  password: 'Qq1234567$'
+  password: 'Qq1234567$',
+  newPassword: '2Times2WillDo'
 };

eform-client/e2e/Page objects/Login.page.ts

@@ -37,6 +37,13 @@ class LoginPage extends Page {
     this.loginBtn.click();
     browser.pause(10000);
   }
+  public loginWithNewPassword(): void {
+    browser.pause(10000);
+    this.usernameInput.setValue(LoginConstants.username);
+    this.passwordInput.setValue(LoginConstants.newPassword);
+    this.loginBtn.click();
+    browser.pause(10000);
+  }
 }
 
 const loginPage = new LoginPage();

eform-client/e2e/Page objects/Navbar.page.ts

@@ -20,14 +20,22 @@ export class Navbar {
     // return browser.element('#sign-out');
     return browser.element(`//*[contains(@class, 'fadeInDropdown')]//*[contains(text(), 'Log ud')]`);
   }
-
+  public get settingsBtn() {
+    return browser.element(`//*[contains(@class, 'fadeInDropdown')]//*[contains(text(), 'Indstillinger')]`);
+  }
+  public get changePasswordBtn() {
+    return browser.element(`//*[contains(@class, 'fadeInDropdown')]//*[contains(text(), 'Skift adgangskode')]`);
+  }
   public get deviceUsersBtn() {
     return this.clickOnHeaderMenuItem(' Enhedsbrugere ');
   }
 
   public clickOnHeaderMenuItem(headerMenuItem) {
     return browser.element(`//*[@id="header"]//*[text()="${headerMenuItem}"]`).element('..').element('..');
   }
+  public verifyHeaderMenuItem(headerMenuItem) {
+    return browser.element(`//*[@id="header"]//*[text()="${headerMenuItem}"]`);
+  }
 
   public logout() {
     this.clickOnHeaderMenuItem('John Smith').click();
@@ -36,12 +44,21 @@ export class Navbar {
     this.logoutBtn.click();
   }
 
+  public goToProfileSettings() {
+    this.clickOnHeaderMenuItem('John Smith').click();
+    this.settingsBtn.click();
+    browser.pause(8000);
+  }
   public goToApplicationSettings() {
     this.advancedDropdown();
     this.applicationSettingsBtn();
     browser.pause(15000);
   }
-
+  public goToPasswordSettings() {
+    this.clickOnHeaderMenuItem('John Smith').click();
+    this.changePasswordBtn.click();
+    browser.pause(8000);
+  }
   public goToDeviceUsersPage() {
     this.deviceUsersBtn.click();
     browser.pause(20000);

eform-client/e2e/Page objects/PasswordSettings.page.ts

@@ -0,0 +1,42 @@
+import {PageWithNavbarPage} from './PageWithNavbar.page';
+
+export class PasswordSettings extends PageWithNavbarPage {
+  constructor() {
+    super();
+  }
+  public get oldPasswordField() {
+    return browser.element('#oldPassword');
+  }
+  public get newPasswordField() {
+    return browser.element('#newPassword');
+  }
+  public get newPasswordConfirmationField() {
+    return browser.element('#newPasswordConfirmation');
+  }
+  public get saveBtn() {
+    return browser.element('#changePasswordSaveBtn');
+  }
+  public setNewPassword() {
+    this.oldPasswordField.addValue('Qq1234567$');
+    browser.pause(1000);
+    this.newPasswordField.addValue('2Times2WillDo');
+    browser.pause(1000);
+    this.newPasswordConfirmationField.addValue('2Times2WillDo');
+    browser.pause(1000);
+    this.saveBtn.click();
+    browser.pause(12000);
+
+  }
+  public revertToOldPassword() {
+    this.oldPasswordField.addValue('2Times2WillDo');
+    browser.pause(1000);
+    this.newPasswordField.addValue('Qq1234567$');
+    browser.pause(1000);
+    this.newPasswordConfirmationField.addValue('Qq1234567$');
+    browser.pause(1000);
+    this.saveBtn.click();
+  }
+}
+
+const passwordSettings = new PasswordSettings();
+export default passwordSettings;

eform-client/e2e/Page objects/ProfileSettings.page.ts

@@ -0,0 +1,28 @@
+import {PageWithNavbarPage} from './PageWithNavbar.page';
+
+export class ProfileSettings extends PageWithNavbarPage {
+  constructor() {
+    super();
+  }
+
+public get languageSelector() {
+    return browser.element('#ProfileLanguageSelector');
+}
+
+public get saveBtn() {
+    return browser.element('#ProfileSettingsSaveBtn');
+}
+
+public saveProfileSettings() {
+    this.saveBtn.click();
+    browser.pause(12000);
+}
+public chooseLanguage(language: string) {
+    this.languageSelector.click();
+    browser.pause(2000);
+  browser.element(`//*[@id="ProfileLanguageSelector"]//*[text()="${language}"]`).click();
+    browser.pause(1000);
+}
+}
+const profileSettings = new ProfileSettings();
+export default profileSettings;

eform-client/e2e/Tests/main-page-eforms/my-eforms.filter-eform.spec.ts

@@ -33,4 +33,4 @@ describe('My eforms', function () {
       });
     });
   });
-}
+});

eform-client/e2e/Tests/password-settings/password-settings.changepassword.spec.ts

@@ -0,0 +1,34 @@
+import loginPage from '../../Page objects/Login.page';
+import myEformsPage from '../../Page objects/MyEforms.page';
+import passwordSettings from '../../Page objects/PasswordSettings.page';
+
+const expect = require('chai').expect;
+
+describe('Password settings', function () {
+  before(function () {
+    loginPage.open('/');
+    loginPage.login();
+    myEformsPage.Navbar.goToPasswordSettings();
+  });
+
+  it('should set password to 2Times2WillDo', function () {
+    passwordSettings.setNewPassword();
+    passwordSettings.Navbar.logout();
+    loginPage.open('/');
+    loginPage.loginWithNewPassword();
+    myEformsPage.Navbar.goToPasswordSettings();
+    // expect(myEformsPage.Navbar.verifyHeaderMenuItem('My eForms')).equal('My eForms');
+    // expect(myEformsPage.Navbar.verifyHeaderMenuItem('Device Users')).equal('Device Users');
+    // expect(myEformsPage.Navbar.verifyHeaderMenuItem('Advanced')).equal('Advanced');
+  });
+  it('should revert to old password', function () {
+    passwordSettings.revertToOldPassword();
+    passwordSettings.Navbar.logout();
+    loginPage.open('/');
+    loginPage.login();
+    myEformsPage.Navbar.goToPasswordSettings();
+    // expect(myEformsPage.Navbar.verifyHeaderMenuItem('Meine eForms')).equal('Meine eForms');
+    // expect(myEformsPage.Navbar.verifyHeaderMenuItem('Gerätebenutzer')).equal('Gerätebenutzer');
+    // expect(myEformsPage.Navbar.verifyHeaderMenuItem('Fortgeschritten')).equal('Fortgeschritten');
+  });
+});

eform-client/e2e/Tests/profile-settings/profile-settings.language.spec.ts

@@ -0,0 +1,37 @@
+import loginPage from '../../Page objects/Login.page';
+import myEformsPage from '../../Page objects/MyEforms.page';
+import profileSettings from '../../Page objects/ProfileSettings.page';
+
+const expect = require('chai').expect;
+
+describe('Profile Settings', function () {
+  before(function () {
+    loginPage.open('/');
+    loginPage.login();
+   myEformsPage.Navbar.goToProfileSettings();
+  });
+  it('should set language to English', function () {
+    profileSettings.chooseLanguage('English');
+    profileSettings.saveProfileSettings();
+    browser.refresh();
+    // expect(myEformsPage.Navbar.verifyHeaderMenuItem('My eForms')).equal('My eForms');
+    // expect(myEformsPage.Navbar.verifyHeaderMenuItem('Device Users')).equal('Device Users');
+    // expect(myEformsPage.Navbar.verifyHeaderMenuItem('Advanced')).equal('Advanced');
+  });
+  it('should set language to German', function () {
+    profileSettings.chooseLanguage('German');
+    profileSettings.saveProfileSettings();
+    browser.refresh();
+    // expect(myEformsPage.Navbar.verifyHeaderMenuItem('Meine eForms')).equal('Meine eForms');
+    // expect(myEformsPage.Navbar.verifyHeaderMenuItem('Gerätebenutzer')).equal('Gerätebenutzer');
+    // expect(myEformsPage.Navbar.verifyHeaderMenuItem('Fortgeschritten')).equal('Fortgeschritten');
+  });
+  it('should set language to Danish', function () {
+    profileSettings.chooseLanguage('Danish');
+    profileSettings.saveProfileSettings();
+    browser.refresh();
+    // expect(myEformsPage.Navbar.verifyHeaderMenuItem('Mine eForms')).equal('Mine eForms');
+    // expect(myEformsPage.Navbar.verifyHeaderMenuItem('Enhedsbrugere')).equal('Enhedsbrugere');
+    // expect(myEformsPage.Navbar.verifyHeaderMenuItem('Avanceret')).equal('Avanceret');
+  });
+});

eform-client/src/app/components/footer/footer.component.html

@@ -14,6 +14,6 @@
     </div>
   </div>
   <div class="footer-copyright text-center p-2 copyright-section">
-    <div>© Microting A/S 2007 - 2018 <div class="footer-version">v{{version}}</div> </div>
+    <div>© Microting A/S 2007 - 2019 <div class="footer-version">v{{version}}</div> </div>
   </div>
 </footer>

eform-client/src/app/modules/account-management/components/profile/change-password/change-password.component.html

@@ -1,6 +1,7 @@
 <eform-page-subheader [title]="'Change password' | translate">
   <div class="p-3">
     <button
+      id="changePasswordSaveBtn"
       class="btn btn-success"
       [disabled]="!changePassword.form.valid"
       (click)="updateUserPassword()">{{ 'Save' | translate }}