Skip to content

Commit 6d9dce3

Browse files
author
Vladislav
committed
Added language selecting in dbpage
1 parent 1575bc3 commit 6d9dce3

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

eform-client/e2e/Page objects/DatabasePage.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {$, ElementFinder} from 'protractor';
1+
import {$, by, element, ElementFinder} from 'protractor';
22
import {default as dbData} from '../dbData';
33

44
export class DatabasePage {
@@ -16,7 +16,13 @@ export class DatabasePage {
1616
public initialCatalogMain: ElementFinder;
1717
public authenticationTypeMain: ElementFinder;
1818
public saveButton: ElementFinder;
19+
public defaultLanguageSelector: ElementFinder;
20+
public englishLanguageOption: ElementFinder;
1921

22+
selectLanguage(languageName) {
23+
this.englishLanguageOption = element(by.cssContainingText('.dropdown-item', languageName));
24+
this.englishLanguageOption.click();
25+
}
2026
public saveDatabase(): void {
2127
// just fill in all inputs for database connection with appropriate values
2228
this.username.sendKeys(dbData.username);
@@ -31,6 +37,8 @@ export class DatabasePage {
3137
this.dataSourceMain.sendKeys(dbData.dataSourceMain);
3238
this.initialCatalogMain.sendKeys(dbData.initialCatalogueMain);
3339
this.authenticationTypeMain.sendKeys(dbData.authenticationTypeMain);
40+
this.defaultLanguageSelector.click();
41+
this.selectLanguage(dbData.languageOptions.english);
3442
this.saveButton.click(); // click "Save" button and submit all inputs
3543
}
3644

@@ -48,7 +56,6 @@ export class DatabasePage {
4856
this.initialCatalogMain = $('#catalogueMain');
4957
this.authenticationTypeMain = $('#authMain');
5058
this.saveButton = $('button.btn.btn-danger.btn-ar');
51-
52-
59+
this.defaultLanguageSelector = $('#defaultLanguageSelector');
5360
}
5461
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export class Navbar {
1212

1313
constructor() {
1414
this.advancedButton = element(by.xpath('//*[@id="bs-example-navbar-collapse-1"]/ul/li[3]/a'));
15-
this.settingsButton = $('a[href="/settings"]');
15+
this.settingsButton = $('a[href="/application-settings"]');
1616
this.deviceUsersButton = $('a[href="/simplesites"]');
1717
this.headerImage = element(by.xpath('//*[@id="header_full_top"]/div/div/div[1]/img'));
1818
this.signOutDropdown = $('#sign-out-dropdown');

eform-client/e2e/dbData.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,9 @@ export default {
1111
dataSourceMain: '(LocalDb)\\SharedInstance',
1212
initialCatalogueMain: 'eFormMain',
1313
authenticationTypeMain: 'Integrated Security=True'
14+
languageOptions: {
15+
english: 'English',
16+
danish: 'Danish'
17+
}
1418
};
1519

0 commit comments

Comments
 (0)