Skip to content

Commit e3ce051

Browse files
committed
Update tests
1 parent d904e1c commit e3ce051

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

tests/e2e/src/main/npm/e2e/pages/confirm-dialog.po.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@ export class ConfirmDialogPage {
66
textInput = element(by.id('resource-to-delete'));
77

88
isPresent() {
9-
return this.modal.isPresent();
9+
return Promise.all([
10+
this.modal.isPresent(),
11+
this.modal.getAttribute('class')
12+
]).then((result) => {
13+
console.log('IsPresent: ', result);
14+
return result[0] && result[1].search('in') !== -1;
15+
}, error => console.error('Error in isPresent', error));
1016
}
1117

1218
requiresText(): Promise<boolean> {

tests/e2e/src/main/npm/e2e/pages/project-level/analysis-config.po.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ export class AnalysisConfigurationPage {
1515

1616
packages = $$('wu-js-tree-wrapper');
1717

18-
includedPackages = this.packages.first().$$('.jstree-node');
18+
includedPackages = this.packages.first().$$('.jstree-node[aria-selected=true]');
1919

20-
excludedPackages = this.packages.get(1).$$('.jstree-node');
20+
excludedPackages = this.packages.get(1).$$('.jstree-node[aria-selected=true]');
2121

2222
saveAndRunButton = $('.btn-save-run');
2323

tests/e2e/src/main/npm/e2e/pages/project-level/analysis-list.po.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {browser, by, element, ElementFinder} from "protractor";
1+
import {$, $$, browser, by, element, ElementFinder} from "protractor";
22

33
export class AnalysisListPage {
44
searchTextBox = element(by.name('searchValue'));
@@ -11,6 +11,10 @@ export class AnalysisListPage {
1111

1212
configureAnalysisButton = element(by.css('.btn.btn-primary'));
1313

14+
progressbar = $('.progress-container');
15+
16+
noActiveAnalysisText = $$('.progressbar-no-active-analysis');
17+
1418
public getExecutions(): Promise<Execution[]> {
1519
return this.table.isPresent().then(isPresent => {
1620
if (!isPresent) {
@@ -34,7 +38,8 @@ export class AnalysisListPage {
3438
showAnalysisDetail: tableColumns.get(0),
3539
showReport: tableColumns.get(4).all(by.css('a')).get(0),
3640
delete: tableColumns.get(4).all(by.css('a')).get(1)
37-
}
41+
},
42+
row: row
3843
};
3944

4045
return Promise.all([
@@ -81,4 +86,5 @@ export interface Execution {
8186
applications: string;
8287
dateStarted: string;
8388
actions: ExecutionActions;
89+
row: ElementFinder;
8490
}

0 commit comments

Comments
 (0)