Skip to content

Commit 392f8d4

Browse files
VladislavKostyukevichVladislavKostyukevich
committed
Fixes
1 parent 413080a commit 392f8d4

File tree

14 files changed

+115
-93
lines changed

14 files changed

+115
-93
lines changed

‎e2e/data/resultsTable/nunitV3ClassName.csv‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
Test Name,Fail Reason,Result,Resolution,Assignee,Comment
2-
"Example.Tests.InnerFolder.Class1.Test2","OneTimeSetUp: System.Exception : Assembly SetUpFixture exception.","Failed","Not Assigned",,
3-
"Example.Tests.InnerFolder.Class1.Test1","OneTimeSetUp: System.Exception : Assembly SetUpFixture exception.","Failed","Not Assigned",,
4-
"Example.Tests.IgnoredClass.Test2","OneTimeSetUp: Ignore reason for suite","Not Executed","Not Assigned",,
5-
"Example.Tests.IgnoredClass.Test1","OneTimeSetUp: Ignore reason for suite","Not Executed","Not Assigned",,
6-
"Example.Tests.FailedClass.Test2","OneTimeSetUp: System.Exception : Here is OneTimeSetup exception.","Failed","Not Assigned",,
7-
"Example.Tests.FailedClass.Test1","OneTimeSetUp: System.Exception : Here is OneTimeSetup exception.","Failed","Not Assigned",,
8-
"Example.Tests.Class3.Test3","OneTimeSetUp: System.Exception : Setup exception.","Failed","Not Assigned",,
9-
"Example.Tests.Class3.Test2","OneTimeSetUp: System.Exception : Setup exception.","Failed","Not Assigned",,
10-
"Example.Tests.Class3.Test1","OneTimeSetUp: System.Exception : Setup exception.","Failed","Not Assigned",,
11-
"Example.Tests.Class2.TestWithTestCaseSource(2)","","Passed",,,
12-
"Example.Tests.Class2.TestWithTestCaseSource(1)","","Passed",,,
13-
"Example.Tests.Class2.TestWithTestCaseSource(0)","","Passed",,,
14-
"Example.Tests.Class2.Test4","","Passed",,,
15-
"Example.Tests.Class2.Test3FailedWithoutMessage","Failed without any message. Please see logs on result page.","Failed","Not Assigned",,
16-
"Example.Tests.Class2.Test3","Assertion: test failed.","Failed","Not Assigned",,
17-
"Example.Tests.Class2.Test2","Assertion: My warn message","Failed","Not Assigned",,
18-
"Example.Tests.Class2.Test1","","Passed",,,
19-
"Example.Tests.Class2.SyncTest","","Passed",,,
20-
"Example.Tests.Class2.IgnoredTest","My ignore reason","Not Executed","Not Assigned",,
21-
"Example.Tests.Class1.Test4","Assertion: Expected: True But was: False ","Failed","Not Assigned",,
22-
"Example.Tests.Class1.Test3","Test exceeded Timeout value of 1000ms","Failed","Not Assigned",,
23-
"Example.Tests.Class1.Test2","","Passed",,,
24-
"Example.Tests.Class1.Test1","","Passed",,,
25-
"Example.Tests.Class1.AttachmentsAreOptional","","Passed",,,
1+
Test Name,Fail Reason,Last Results,Result,Resolution,Assignee,Comment
2+
"Example.Tests.Class1.AttachmentsAreOptional","","","Passed",,,
3+
"Example.Tests.Class1.Test1","","","Passed",,,
4+
"Example.Tests.Class1.Test2","","","Passed",,,
5+
"Example.Tests.Class1.Test3","Test exceeded Timeout value of 1000ms","","Failed","Not Assigned",,
6+
"Example.Tests.Class1.Test4","Assertion: Expected: True But was: False ","","Failed","Not Assigned",,
7+
"Example.Tests.Class2.IgnoredTest","My ignore reason","","Not Executed","Not Assigned",,
8+
"Example.Tests.Class2.SyncTest","","","Passed",,,
9+
"Example.Tests.Class2.Test1","","","Passed",,,
10+
"Example.Tests.Class2.Test2","Assertion: My warn message","","Failed","Not Assigned",,
11+
"Example.Tests.Class2.Test3","Assertion: test failed.","","Failed","Not Assigned",,
12+
"Example.Tests.Class2.Test3FailedWithoutMessage","Failed without any message. Please see logs on result page.","","Failed","Not Assigned",,
13+
"Example.Tests.Class2.Test4","","","Passed",,,
14+
"Example.Tests.Class2.TestWithTestCaseSource(0)","","","Passed",,,
15+
"Example.Tests.Class2.TestWithTestCaseSource(1)","","","Passed",,,
16+
"Example.Tests.Class2.TestWithTestCaseSource(2)","","","Passed",,,
17+
"Example.Tests.Class3.Test1","OneTimeSetUp: System.Exception : Setup exception.","","Failed","Not Assigned",,
18+
"Example.Tests.Class3.Test2","OneTimeSetUp: System.Exception : Setup exception.","","Failed","Not Assigned",,
19+
"Example.Tests.Class3.Test3","OneTimeSetUp: System.Exception : Setup exception.","","Failed","Not Assigned",,
20+
"Example.Tests.FailedClass.Test1","OneTimeSetUp: System.Exception : Here is OneTimeSetup exception.","","Failed","Not Assigned",,
21+
"Example.Tests.FailedClass.Test2","OneTimeSetUp: System.Exception : Here is OneTimeSetup exception.","","Failed","Not Assigned",,
22+
"Example.Tests.IgnoredClass.Test1","OneTimeSetUp: Ignore reason for suite","","Not Executed","Not Assigned",,
23+
"Example.Tests.IgnoredClass.Test2","OneTimeSetUp: Ignore reason for suite","","Not Executed","Not Assigned",,
24+
"Example.Tests.InnerFolder.Class1.Test1","OneTimeSetUp: System.Exception : Assembly SetUpFixture exception.","","Failed","Not Assigned",,
25+
"Example.Tests.InnerFolder.Class1.Test2","OneTimeSetUp: System.Exception : Assembly SetUpFixture exception.","","Failed","Not Assigned",,

‎e2e/data/resultsTable/nunitV3FeatureName.csv‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
Test Name,Fail Reason,Result,Resolution,Assignee,Comment
2-
"IgnoredClass: Test2","OneTimeSetUp: Ignore reason for suite","Not Executed","Not Assigned",,
3-
"IgnoredClass: Test1","OneTimeSetUp: Ignore reason for suite","Not Executed","Not Assigned",,
4-
"FailedClass: Test2","OneTimeSetUp: System.Exception : Here is OneTimeSetup exception.","Failed","Not Assigned",,
5-
"FailedClass: Test1","OneTimeSetUp: System.Exception : Here is OneTimeSetup exception.","Failed","Not Assigned",,
6-
"Class3: Test3","OneTimeSetUp: System.Exception : Setup exception.","Failed","Not Assigned",,
7-
"Class3: Test2","OneTimeSetUp: System.Exception : Setup exception.","Failed","Not Assigned",,
8-
"Class3: Test1","OneTimeSetUp: System.Exception : Setup exception.","Failed","Not Assigned",,
9-
"Class2: TestWithTestCaseSource(2)","","Passed",,,
10-
"Class2: TestWithTestCaseSource(1)","","Passed",,,
11-
"Class2: TestWithTestCaseSource(0)","","Passed",,,
12-
"Class2: Test4","","Passed",,,
13-
"Class2: Test3FailedWithoutMessage","Failed without any message. Please see logs on result page.","Failed","Not Assigned",,
14-
"Class2: Test3","Assertion: test failed.","Failed","Not Assigned",,
15-
"Class2: Test2","Assertion: My warn message","Failed","Not Assigned",,
16-
"Class2: Test1","","Passed",,,
17-
"Class2: SyncTest","","Passed",,,
18-
"Class2: IgnoredTest","My ignore reason","Not Executed","Not Assigned",,
19-
"Class1: Test4","Assertion: Expected: True But was: False ","Failed","Not Assigned",,
20-
"Class1: Test3","Test exceeded Timeout value of 1000ms","Failed","Not Assigned",,
21-
"Class1: Test2","","Passed",,,
22-
"Class1: Test2","OneTimeSetUp: System.Exception : Assembly SetUpFixture exception.","Failed","Not Assigned",,
23-
"Class1: Test1","","Passed",,,
24-
"Class1: Test1","OneTimeSetUp: System.Exception : Assembly SetUpFixture exception.","Failed","Not Assigned",,
25-
"Class1: AttachmentsAreOptional","","Passed",,,
1+
Test Name,Fail Reason,Last Results,Result,Resolution,Assignee,Comment
2+
"Class1: AttachmentsAreOptional","","","Passed",,,
3+
"Class1: Test1","","","Passed",,,
4+
"Class1: Test1","OneTimeSetUp: System.Exception : Assembly SetUpFixture exception.","","Failed","Not Assigned",,
5+
"Class1: Test2","","","Passed",,,
6+
"Class1: Test2","OneTimeSetUp: System.Exception : Assembly SetUpFixture exception.","","Failed","Not Assigned",,
7+
"Class1: Test3","Test exceeded Timeout value of 1000ms","","Failed","Not Assigned",,
8+
"Class1: Test4","Assertion: Expected: True But was: False ","","Failed","Not Assigned",,
9+
"Class2: IgnoredTest","My ignore reason","","Not Executed","Not Assigned",,
10+
"Class2: SyncTest","","","Passed",,,
11+
"Class2: Test1","","","Passed",,,
12+
"Class2: Test2","Assertion: My warn message","","Failed","Not Assigned",,
13+
"Class2: Test3","Assertion: test failed.","","Failed","Not Assigned",,
14+
"Class2: Test3FailedWithoutMessage","Failed without any message. Please see logs on result page.","","Failed","Not Assigned",,
15+
"Class2: Test4","","","Passed",,,
16+
"Class2: TestWithTestCaseSource(0)","","","Passed",,,
17+
"Class2: TestWithTestCaseSource(1)","","","Passed",,,
18+
"Class2: TestWithTestCaseSource(2)","","","Passed",,,
19+
"Class3: Test1","OneTimeSetUp: System.Exception : Setup exception.","","Failed","Not Assigned",,
20+
"Class3: Test2","OneTimeSetUp: System.Exception : Setup exception.","","Failed","Not Assigned",,
21+
"Class3: Test3","OneTimeSetUp: System.Exception : Setup exception.","","Failed","Not Assigned",,
22+
"FailedClass: Test1","OneTimeSetUp: System.Exception : Here is OneTimeSetup exception.","","Failed","Not Assigned",,
23+
"FailedClass: Test2","OneTimeSetUp: System.Exception : Here is OneTimeSetup exception.","","Failed","Not Assigned",,
24+
"IgnoredClass: Test1","OneTimeSetUp: Ignore reason for suite","","Not Executed","Not Assigned",,
25+
"IgnoredClass: Test2","OneTimeSetUp: Ignore reason for suite","","Not Executed","Not Assigned",,

‎e2e/elements/searcher/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export class ResultSearcher extends BaseElement {
5454
}
5555

5656
async isSearcherOpened() {
57-
const classValue = await this.element.element(By.css('#resultSearcherOpener span')).getAttribute('class');
57+
const classValue = await this.element.element(By.css('#resultSearcherOpener svg')).getAttribute('data-icon');
5858
return classValue.includes('up');
5959
}
6060

‎e2e/pages/audit/create.po/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ class CreateAudit extends BasePage {
4040
}
4141
}
4242

43-
export const createAudit = new CreateAudit();
43+
export const createAudit = new CreateAudit();

‎e2e/pages/testrun/view.po/constants.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const elements = {
2626
executor: new InlineEditor(by.id(`executor`)),
2727
executionEnvironment: new InlineEditor(by.id(`execution_environment`)),
2828
testSuiteLink: element(by.id(`suite_link`)),
29-
startTimeLabel: element(by.xpath(`//li[.//label[contains(text(), '${names.startTimeLabel}')]]//p`)),
29+
startTimeLabel: element(by.id(`start-time`)),
3030
resultsTable: new SmartTable(by.css('#testRunViewResultsGrid #resultsGridMain')),
3131
resultSearcher: new ResultSearcher(by.id('resultSearcher')),
3232
resultsChart: new ResultPieChart(by.id('finalResultsChart')),

‎e2e/specs/audit/auditFlow.spec.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { projectList } from '../../pages/project/list.po';
33
import { projectAudits } from '../../pages/audit/project.list.po';
44
import { createAudit } from '../../pages/audit/create.po';
55
import { auditInfo } from '../../pages/audit/view.po';
6-
import { browser } from 'protractor';
76
import { testData } from '../../utils/testData.util';
87
import { ProjectHelper } from '../../helpers/project.helper';
98

‎e2e/specs/hooks.spec.ts‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ beforeAll(async () => {
2222
throw new Error(`Backend is unavailable ${environment.host}`);
2323
}
2424
await logIn.navigateTo();
25-
// await logIn.logInAs(usersTestData.admin.user_name, usersTestData.admin.password);
26-
// await projectList.menuBar.administration();
27-
// await userAdministration.create(usersTestData.autoAdmin);
28-
// await userAdministration.create(usersTestData.localAdmin);
29-
// await userAdministration.create(usersTestData.auditAdmin);
30-
// await userAdministration.create(usersTestData.assignedAuditor);
31-
// await userAdministration.create(usersTestData.localManager);
32-
// await userAdministration.create(usersTestData.localEngineer);
33-
// await userAdministration.create(usersTestData.manager);
34-
// await userAdministration.create(usersTestData.projectTemp);
35-
// await userAdministration.create(usersTestData.viewer);
36-
// await userAdministration.menuBar.clickLogOut();
25+
await logIn.logInAs(usersTestData.admin.user_name, usersTestData.admin.password);
26+
await projectList.menuBar.administration();
27+
await userAdministration.create(usersTestData.autoAdmin);
28+
await userAdministration.create(usersTestData.localAdmin);
29+
await userAdministration.create(usersTestData.auditAdmin);
30+
await userAdministration.create(usersTestData.assignedAuditor);
31+
await userAdministration.create(usersTestData.localManager);
32+
await userAdministration.create(usersTestData.localEngineer);
33+
await userAdministration.create(usersTestData.manager);
34+
await userAdministration.create(usersTestData.projectTemp);
35+
await userAdministration.create(usersTestData.viewer);
36+
await userAdministration.menuBar.clickLogOut();
3737
});
3838

3939
beforeEach(async () => {
@@ -44,14 +44,14 @@ beforeEach(async () => {
4444
});
4545

4646
afterAll(async () => {
47-
// await logIn.logInAs(usersTestData.admin.user_name, usersTestData.admin.password);
48-
// await projectList.menuBar.administration();
49-
// await userAdministration.remove(usersTestData.localAdmin.user_name);
50-
// await userAdministration.remove(usersTestData.autoAdmin.user_name);
51-
// await userAdministration.remove(usersTestData.localManager.user_name);
52-
// await userAdministration.remove(usersTestData.localEngineer.user_name);
53-
// await userAdministration.remove(usersTestData.manager.user_name);
54-
// await userAdministration.remove(usersTestData.projectTemp.user_name);
55-
// await userAdministration.remove(usersTestData.viewer.user_name);
56-
// await userAdministration.menuBar.clickLogOut();
47+
await logIn.logInAs(usersTestData.admin.user_name, usersTestData.admin.password);
48+
await projectList.menuBar.administration();
49+
await userAdministration.remove(usersTestData.localAdmin.user_name);
50+
await userAdministration.remove(usersTestData.autoAdmin.user_name);
51+
await userAdministration.remove(usersTestData.localManager.user_name);
52+
await userAdministration.remove(usersTestData.localEngineer.user_name);
53+
await userAdministration.remove(usersTestData.manager.user_name);
54+
await userAdministration.remove(usersTestData.projectTemp.user_name);
55+
await userAdministration.remove(usersTestData.viewer.user_name);
56+
await userAdministration.menuBar.clickLogOut();
5757
});

‎e2e/specs/suite/syncSuite.spec.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ describe('Sync Test Suite', () => {
103103

104104
it('Select suite for sync', async () => {
105105
await syncSuite.selectSuite(testSuite);
106-
return expect(syncSuite.isSyncButtonEnabled()).toBe(true, 'Sync button should be enable if suite is selected');
106+
await expect(syncSuite.isSyncButtonEnabled()).toBe(true, 'Sync button should be enable if suite is selected');
107+
return syncSuite.cancel();
107108
});
108109

109110
it('Check default fields if suite was chosen', async () => {

‎e2e/specs/suite/testSuite.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ describe('Full Admin Test Suite', () => {
2424

2525
it('Create button is disabled when Name is not filled', async () => {
2626
await (await projectView.menuBar.create()).suite();
27-
expect(suiteCreate.isCreateEnabled()).toBe(false, 'Create button should be disabled');
27+
return expect(suiteCreate.isCreateEnabled()).toBe(false, 'Create button should be disabled');
2828
});
2929

3030
it('Suites List page should be opend after Suite creation', async () => {
3131
await suiteCreate.createSuite(suite);
32-
expect(suiteList.isOpened()).toBe(true, 'Suites List should be opened');
32+
return expect(suiteList.isOpened()).toBe(true, 'Suites List should be opened');
3333
});
3434

3535
it('New Suite should be in list', () => {

‎src/app/derectives/mfTableSorter.derective.ts‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {
33
Input, Output, Renderer, EventEmitter
44
} from '@angular/core';
55
import { TFSorting, TFOrder } from '../elements/table/tfColumn';
6-
import { faArrowUp, faArrowDown} from '@fortawesome/free-solid-svg-icons';
76

87
@Directive({
98
selector: '[sorter]'
@@ -41,22 +40,36 @@ export class TableSorterDerective implements AfterViewChecked {
4140

4241
const up: Element = element.getElementsByClassName('up')[0];
4342
const down: Element = element.getElementsByClassName('down')[0];
44-
this.hide(element);
4543

46-
switch (this.sorter.order) {
44+
45+
switch (this.getCurrentSortOrder(up, down)) {
4746
case TFOrder.asc:
4847
this.sorter.order = TFOrder.desc;
48+
this.hide(element);
4949
this.show(down);
5050
break;
5151
case TFOrder.desc:
52-
this.show(up);
5352
this.sorter.order = TFOrder.asc;
53+
this.hide(element);
54+
this.show(up);
5455
break;
5556
}
5657

5758
this.sorted.emit(this.sorter);
5859
}
5960

61+
getCurrentSortOrder(up: Element, down: Element) {
62+
if (up.getAttribute('style') === 'display: inline-table') {
63+
return TFOrder.asc;
64+
}
65+
66+
if (down.getAttribute('style') === 'display: inline-table') {
67+
return TFOrder.desc;
68+
}
69+
70+
return TFOrder.asc;
71+
}
72+
6073
show(element: Element) {
6174
element.setAttribute('style', 'display: inline-table');
6275
}

0 commit comments

Comments
 (0)