Skip to content

Commit b851d80

Browse files
magjed4289brianchandotcom
authored andcommitted
LPD-37287 Make assertion available for allpossible substages of PENDING
1 parent f70af3f commit b851d80

File tree

4 files changed

+8
-17
lines changed

4 files changed

+8
-17
lines changed

portal-web/test/functional/com/liferay/portalweb/macros/Staging.macro

+3-12
Original file line numberDiff line numberDiff line change
@@ -1417,18 +1417,9 @@ definition {
14171417

14181418
AssertElementNotPresent(locator1 = "Staging#STAGING_MENU_SUBMIT_FOR_WORKFLOW");
14191419

1420-
Refresh();
1421-
1422-
if (IsTextEqual(locator1 = "Message#WORKFLOW_STATUS", value1 = "Pending (Created)")) {
1423-
AssertTextEquals(
1424-
locator1 = "Message#WORKFLOW_STATUS",
1425-
value1 = "Pending (Created)");
1426-
}
1427-
else {
1428-
AssertTextEquals(
1429-
locator1 = "Message#WORKFLOW_STATUS",
1430-
value1 = "Pending (Review)");
1431-
}
1420+
AssertTextEquals.assertPartialText(
1421+
locator1 = "Message#WORKFLOW_STATUS",
1422+
value1 = "Pending");
14321423
}
14331424

14341425
@summary = "Default summary"

portal-web/test/functional/com/liferay/portalweb/macros/layout/sitepage/Page.macro

+1-1
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ definition {
589589
AssertElementPresent(locator1 = "Staging#STAGING_MENU_READY_FOR_PUBLICATION");
590590
}
591591
else {
592-
AssertTextEquals(
592+
AssertTextEquals.assertPartialText(
593593
locator1 = "Message#WORKFLOW_STATUS",
594594
value1 = ${workflowStatus});
595595
}

portal-web/test/functional/com/liferay/portalweb/tests/enduser/staging/usecase/Staging.testcase

+1-1
Original file line numberDiff line numberDiff line change
@@ -3646,7 +3646,7 @@ definition {
36463646
pageName = "Child Page A",
36473647
siteName = "Site Name Staging");
36483648

3649-
Page.viewWithWorkflowPG(workflowStatus = "Pending (Review)");
3649+
Page.viewWithWorkflowPG(workflowStatus = "Pending");
36503650

36513651
Navigator.gotoStagedSitePage(
36523652
pageName = "Staging Page Edit",

portal-web/test/functional/com/liferay/portalweb/tests/enduser/staging/usecase/StagingUsecaseWithVersioning.testcase

+3-3
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ definition {
410410

411411
Workflow.gotoPreviewView(pageRevision = "true");
412412

413-
Page.viewWithWorkflowPG(workflowStatus = "Pending (Review)");
413+
Page.viewWithWorkflowPG(workflowStatus = "Pending");
414414

415415
Navigator.gotoStagedSitePage(
416416
pageName = "Page Revision Page",
@@ -438,13 +438,13 @@ definition {
438438

439439
Workflow.gotoPreviewView(pageRevision = "true");
440440

441-
Page.viewWithWorkflowPG(workflowStatus = "Pending (Review)");
441+
Page.viewWithWorkflowPG(workflowStatus = "Pending");
442442

443443
Navigator.gotoStagedSitePage(
444444
pageName = "Page Revision Page",
445445
siteName = "Site Name");
446446

447-
Page.viewWithWorkflowPG(workflowStatus = "Pending (Review)");
447+
Page.viewWithWorkflowPG(workflowStatus = "Pending");
448448

449449
UserBar.gotoDropdownItem(dropdownItem = "My Workflow Tasks");
450450

0 commit comments

Comments
 (0)