mirror of
https://github.com/Kingsrook/qqq-frontend-material-dashboard.git
synced 2025-07-18 13:20:43 +00:00
CE-793 - Fixes for failed selnium tests
This commit is contained in:
@ -80,9 +80,9 @@ public class QueryScreenLib
|
||||
/*******************************************************************************
|
||||
**
|
||||
*******************************************************************************/
|
||||
public WebElement assertQuickFilterButtonBadge(String fieldName)
|
||||
public WebElement assertQuickFilterButtonIndicatesActiveFilter(String fieldName)
|
||||
{
|
||||
return qSeleniumLib.waitForSelector("#quickFilter\\." + fieldName + " .MuiBadge-root");
|
||||
return qSeleniumLib.waitForSelector("#quickFilter\\." + fieldName + ".filterActive");
|
||||
}
|
||||
|
||||
|
||||
@ -92,7 +92,6 @@ public class QueryScreenLib
|
||||
*******************************************************************************/
|
||||
public void clickQuickFilterButton(String fieldName)
|
||||
{
|
||||
// qSeleniumLib.waitForSelectorContaining(".MuiDataGrid-toolbarContainer BUTTON", "Filter").click();
|
||||
qSeleniumLib.waitForSelector("#quickFilter\\." + fieldName).click();
|
||||
}
|
||||
|
||||
|
@ -98,18 +98,6 @@ public class QueryScreenFilterInUrlAdvancedModeTest extends QBaseSeleniumTest
|
||||
qSeleniumLib.waitForSelector("input[value=\"1701\"]");
|
||||
qSeleniumLib.waitForSelector("input[value=\"74656\"]");
|
||||
|
||||
//////////////////////////////////////////
|
||||
// not-equals on a possible-value field //
|
||||
//////////////////////////////////////////
|
||||
filterJSON = JsonUtils.toJson(new QQueryFilter()
|
||||
.withCriteria(new QFilterCriteria("homeCityId", QCriteriaOperator.NOT_EQUALS, 1)));
|
||||
qSeleniumLib.gotoAndWaitForBreadcrumbHeader("/peopleApp/greetingsApp/person?filter=" + URLEncoder.encode(filterJSON, StandardCharsets.UTF_8), "Person");
|
||||
queryScreenLib.waitForQueryToHaveRan();
|
||||
queryScreenLib.assertFilterButtonBadge(1);
|
||||
queryScreenLib.clickFilterButton();
|
||||
qSeleniumLib.waitForSelector("input[value=\"does not equal\"]");
|
||||
qSeleniumLib.waitForSelector("input[value=\"St. Louis\"]");
|
||||
|
||||
//////////////////////////////////////
|
||||
// an IN for a possible-value field //
|
||||
//////////////////////////////////////
|
||||
@ -150,6 +138,27 @@ public class QueryScreenFilterInUrlAdvancedModeTest extends QBaseSeleniumTest
|
||||
qSeleniumLib.waitForSelector("input[value=\"starts with\"]");
|
||||
qSeleniumLib.waitForSelector("input[value=\"Dar\"]");
|
||||
|
||||
/////////////////////////////////////////////////
|
||||
// replace the homeCityId possible-value route //
|
||||
/////////////////////////////////////////////////
|
||||
qSeleniumJavalin.stop();
|
||||
qSeleniumJavalin.clearRoutes();
|
||||
addJavalinRoutes(qSeleniumJavalin);
|
||||
qSeleniumJavalin.withRouteToFile("/data/person/possibleValues/homeCityId", "data/person/possibleValues/homeCityId=1.json");
|
||||
qSeleniumJavalin.restart();
|
||||
|
||||
//////////////////////////////////////////
|
||||
// not-equals on a possible-value field //
|
||||
//////////////////////////////////////////
|
||||
filterJSON = JsonUtils.toJson(new QQueryFilter()
|
||||
.withCriteria(new QFilterCriteria("homeCityId", QCriteriaOperator.NOT_EQUALS, 1)));
|
||||
qSeleniumLib.gotoAndWaitForBreadcrumbHeader("/peopleApp/greetingsApp/person?filter=" + URLEncoder.encode(filterJSON, StandardCharsets.UTF_8), "Person");
|
||||
queryScreenLib.waitForQueryToHaveRan();
|
||||
queryScreenLib.assertFilterButtonBadge(1);
|
||||
queryScreenLib.clickFilterButton();
|
||||
qSeleniumLib.waitForSelector("input[value=\"does not equal\"]");
|
||||
qSeleniumLib.waitForSelector("input[value=\"St. Louis\"]");
|
||||
|
||||
////////////////
|
||||
// remove one //
|
||||
////////////////
|
||||
|
@ -75,7 +75,7 @@ public class QueryScreenFilterInUrlBasicModeTest extends QBaseSeleniumTest
|
||||
.withCriteria(new QFilterCriteria("annualSalary", QCriteriaOperator.IS_NOT_BLANK)));
|
||||
qSeleniumLib.gotoAndWaitForBreadcrumbHeader("/peopleApp/greetingsApp/person?filter=" + URLEncoder.encode(filterJSON, StandardCharsets.UTF_8), "Person");
|
||||
queryScreenLib.waitForQueryToHaveRan();
|
||||
queryScreenLib.assertQuickFilterButtonBadge("annualSalary");
|
||||
queryScreenLib.assertQuickFilterButtonIndicatesActiveFilter("annualSalary");
|
||||
queryScreenLib.clickQuickFilterButton("annualSalary");
|
||||
qSeleniumLib.waitForSelector("input[value=\"is not empty\"]");
|
||||
|
||||
@ -86,7 +86,7 @@ public class QueryScreenFilterInUrlBasicModeTest extends QBaseSeleniumTest
|
||||
.withCriteria(new QFilterCriteria("annualSalary", QCriteriaOperator.BETWEEN, 1701, 74656)));
|
||||
qSeleniumLib.gotoAndWaitForBreadcrumbHeader("/peopleApp/greetingsApp/person?filter=" + URLEncoder.encode(filterJSON, StandardCharsets.UTF_8), "Person");
|
||||
queryScreenLib.waitForQueryToHaveRan();
|
||||
queryScreenLib.assertQuickFilterButtonBadge("annualSalary");
|
||||
queryScreenLib.assertQuickFilterButtonIndicatesActiveFilter("annualSalary");
|
||||
queryScreenLib.clickQuickFilterButton("annualSalary");
|
||||
qSeleniumLib.waitForSelector("input[value=\"is between\"]");
|
||||
qSeleniumLib.waitForSelector("input[value=\"1701\"]");
|
||||
@ -99,7 +99,7 @@ public class QueryScreenFilterInUrlBasicModeTest extends QBaseSeleniumTest
|
||||
.withCriteria(new QFilterCriteria("homeCityId", QCriteriaOperator.NOT_EQUALS, 1)));
|
||||
qSeleniumLib.gotoAndWaitForBreadcrumbHeader("/peopleApp/greetingsApp/person?filter=" + URLEncoder.encode(filterJSON, StandardCharsets.UTF_8), "Person");
|
||||
queryScreenLib.waitForQueryToHaveRan();
|
||||
queryScreenLib.assertQuickFilterButtonBadge("homeCityId");
|
||||
queryScreenLib.assertQuickFilterButtonIndicatesActiveFilter("homeCityId");
|
||||
queryScreenLib.clickQuickFilterButton("homeCityId");
|
||||
qSeleniumLib.waitForSelector("input[value=\"does not equal\"]");
|
||||
qSeleniumLib.waitForSelector("input[value=\"St. Louis\"]");
|
||||
@ -111,7 +111,7 @@ public class QueryScreenFilterInUrlBasicModeTest extends QBaseSeleniumTest
|
||||
.withCriteria(new QFilterCriteria("homeCityId", QCriteriaOperator.IN, 1, 2)));
|
||||
qSeleniumLib.gotoAndWaitForBreadcrumbHeader("/peopleApp/greetingsApp/person?filter=" + URLEncoder.encode(filterJSON, StandardCharsets.UTF_8), "Person");
|
||||
queryScreenLib.waitForQueryToHaveRan();
|
||||
queryScreenLib.assertQuickFilterButtonBadge("homeCityId");
|
||||
queryScreenLib.assertQuickFilterButtonIndicatesActiveFilter("homeCityId");
|
||||
queryScreenLib.clickQuickFilterButton("homeCityId");
|
||||
qSeleniumLib.waitForSelector("input[value=\"is any of\"]");
|
||||
qSeleniumLib.waitForSelectorContaining(".MuiChip-label", "St. Louis");
|
||||
@ -124,7 +124,7 @@ public class QueryScreenFilterInUrlBasicModeTest extends QBaseSeleniumTest
|
||||
.withCriteria(new QFilterCriteria("createDate", QCriteriaOperator.GREATER_THAN, NowWithOffset.minus(5, ChronoUnit.DAYS))));
|
||||
qSeleniumLib.gotoAndWaitForBreadcrumbHeader("/peopleApp/greetingsApp/person?filter=" + URLEncoder.encode(filterJSON, StandardCharsets.UTF_8), "Person");
|
||||
queryScreenLib.waitForQueryToHaveRan();
|
||||
queryScreenLib.assertQuickFilterButtonBadge("createDate");
|
||||
queryScreenLib.assertQuickFilterButtonIndicatesActiveFilter("createDate");
|
||||
queryScreenLib.clickQuickFilterButton("createDate");
|
||||
qSeleniumLib.waitForSelector("input[value=\"is after\"]");
|
||||
qSeleniumLib.waitForSelector("input[value=\"5 days ago\"]");
|
||||
@ -137,8 +137,8 @@ public class QueryScreenFilterInUrlBasicModeTest extends QBaseSeleniumTest
|
||||
.withCriteria(new QFilterCriteria("createDate", QCriteriaOperator.LESS_THAN_OR_EQUALS, ThisOrLastPeriod.this_(ChronoUnit.YEARS))));
|
||||
qSeleniumLib.gotoAndWaitForBreadcrumbHeader("/peopleApp/greetingsApp/person?filter=" + URLEncoder.encode(filterJSON, StandardCharsets.UTF_8), "Person");
|
||||
queryScreenLib.waitForQueryToHaveRan();
|
||||
queryScreenLib.assertQuickFilterButtonBadge("firstName");
|
||||
queryScreenLib.assertQuickFilterButtonBadge("createDate");
|
||||
queryScreenLib.assertQuickFilterButtonIndicatesActiveFilter("firstName");
|
||||
queryScreenLib.assertQuickFilterButtonIndicatesActiveFilter("createDate");
|
||||
queryScreenLib.clickQuickFilterButton("createDate");
|
||||
qSeleniumLib.waitForSelector("input[value=\"is at or before\"]");
|
||||
qSeleniumLib.waitForSelector("input[value=\"start of this year\"]");
|
||||
|
@ -0,0 +1,8 @@
|
||||
{
|
||||
"options": [
|
||||
{
|
||||
"id": 1,
|
||||
"label": "St. Louis"
|
||||
}
|
||||
]
|
||||
}
|
@ -223,21 +223,21 @@
|
||||
"label": "Sleep Interactive",
|
||||
"isHidden": false
|
||||
},
|
||||
"querySavedFilter": {
|
||||
"name": "querySavedFilter",
|
||||
"label": "Query Saved Filter",
|
||||
"querySavedView": {
|
||||
"name": "querySavedView",
|
||||
"label": "Query Saved View",
|
||||
"isHidden": false,
|
||||
"hasPermission": true
|
||||
},
|
||||
"storeSavedFilter": {
|
||||
"name": "storeSavedFilter",
|
||||
"label": "Store Saved Filter",
|
||||
"storeSavedView": {
|
||||
"name": "storeSavedView",
|
||||
"label": "Store Saved View",
|
||||
"isHidden": false,
|
||||
"hasPermission": true
|
||||
},
|
||||
"deleteSavedFilter": {
|
||||
"name": "deleteSavedFilter",
|
||||
"label": "Delete Saved Filter",
|
||||
"deleteSavedView": {
|
||||
"name": "deleteSavedView",
|
||||
"label": "Delete Saved View",
|
||||
"isHidden": false,
|
||||
"hasPermission": true
|
||||
},
|
||||
|
Reference in New Issue
Block a user