diff --git a/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/lib/QueryScreenLib.java b/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/lib/QueryScreenLib.java index 9ba303b..5fcf36a 100644 --- a/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/lib/QueryScreenLib.java +++ b/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/lib/QueryScreenLib.java @@ -57,6 +57,16 @@ public class QueryScreenLib + /******************************************************************************* + ** + *******************************************************************************/ + public void assertNoFilterButtonBadge(int valueInBadge) + { + qSeleniumLib.waitForSelectorContainingToNotExist(".MuiBadge-root", String.valueOf(valueInBadge)); + } + + + /******************************************************************************* ** *******************************************************************************/ diff --git a/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/tests/QueryScreenFilterInUrlAdvancedModeTest.java b/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/tests/QueryScreenFilterInUrlAdvancedModeTest.java index 8165f62..d7be415 100755 --- a/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/tests/QueryScreenFilterInUrlAdvancedModeTest.java +++ b/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/tests/QueryScreenFilterInUrlAdvancedModeTest.java @@ -163,7 +163,7 @@ public class QueryScreenFilterInUrlAdvancedModeTest extends QBaseSeleniumTest // remove one // //////////////// qSeleniumLib.waitForSelectorContaining(".MuiIcon-root", "close").click(); - queryScreenLib.assertFilterButtonBadge(1); + queryScreenLib.assertNoFilterButtonBadge(1); // qSeleniumLib.waitForever(); } diff --git a/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/tests/SavedViewsTest.java b/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/tests/SavedViewsTest.java index f58e9be..3d3c0ee 100755 --- a/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/tests/SavedViewsTest.java +++ b/src/test/java/com/kingsrook/qqq/frontend/materialdashboard/selenium/tests/SavedViewsTest.java @@ -67,7 +67,6 @@ public class SavedViewsTest extends QBaseSeleniumTest QueryScreenLib queryScreenLib = new QueryScreenLib(qSeleniumLib); qSeleniumLib.gotoAndWaitForBreadcrumbHeader("/peopleApp/greetingsApp/person", "Person"); - queryScreenLib.gotoAdvancedMode(); qSeleniumLib.waitForSelectorContaining("BUTTON", "Saved Views").click(); qSeleniumLib.waitForSelectorContaining("LI", "Some People"); @@ -95,14 +94,14 @@ public class SavedViewsTest extends QBaseSeleniumTest qSeleniumLib.waitForSelectorContaining("DIV.MuiDataGrid-cell", "jdoe@kingsrook.com").click(); qSeleniumLib.waitForSelectorContaining("H5", "Viewing Person: John Doe"); - ///////////////////////////////////////////////////// - // take breadcrumb back to table query // + /////////////////////////////////////////////////// + // take breadcrumb back to table query // // assert the previously selected View is loaded // - ///////////////////////////////////////////////////// + /////////////////////////////////////////////////// qSeleniumLib.waitForSelectorContaining("A", "Person").click(); qSeleniumLib.waitForCondition("Current URL should have View id", () -> driver.getCurrentUrl().endsWith("/person/savedView/2")); qSeleniumLib.waitForSelectorContaining("DIV", "Current View: Some People"); - qSeleniumLib.waitForSelectorContaining(".MuiBadge-badge", "1"); + queryScreenLib.assertQuickFilterButtonIndicatesActiveFilter("firstName"); ////////////////////// // modify the query // diff --git a/src/test/resources/fixtures/processes/querySavedView/init-id=2.json b/src/test/resources/fixtures/processes/querySavedView/init-id=2.json index b0b601f..b6dd197 100644 --- a/src/test/resources/fixtures/processes/querySavedView/init-id=2.json +++ b/src/test/resources/fixtures/processes/querySavedView/init-id=2.json @@ -10,7 +10,7 @@ "createDate": "2023-02-20T18:40:58Z", "modifyDate": "2023-02-20T18:40:58Z", "tableName": "person", - "filterJson": "{\"filter\":{\"criteria\":[{\"fieldName\":\"firstName\",\"operator\":\"STARTS_WITH\",\"values\":[\"D\"]}],\"orderBys\":[{\"fieldName\":\"id\",\"isAscending\":false}],\"booleanOperator\":\"AND\"}}", + "viewJson": "{\"queryFilter\":{\"criteria\":[{\"fieldName\":\"firstName\",\"operator\":\"STARTS_WITH\",\"values\":[\"D\"]}],\"orderBys\":[{\"fieldName\":\"id\",\"isAscending\":false}],\"booleanOperator\":\"AND\"}}", "userId": "darin.kelkhoff@kingsrook.com" } } diff --git a/src/test/resources/fixtures/processes/querySavedView/init.json b/src/test/resources/fixtures/processes/querySavedView/init.json index 7f03dd5..fd8404b 100644 --- a/src/test/resources/fixtures/processes/querySavedView/init.json +++ b/src/test/resources/fixtures/processes/querySavedView/init.json @@ -10,7 +10,7 @@ "createDate": "2023-02-20T18:39:11Z", "modifyDate": "2023-02-20T18:39:11Z", "tableName": "person", - "filterJson": "{\"filter\":{\"orderBys\":[{\"fieldName\":\"id\",\"isAscending\":false}],\"booleanOperator\":\"AND\"}}", + "viewJson": "{\"queryFilter\":{\"orderBys\":[{\"fieldName\":\"id\",\"isAscending\":false}],\"booleanOperator\":\"AND\"}}", "userId": "darin.kelkhoff@kingsrook.com" } }, @@ -22,7 +22,7 @@ "createDate": "2023-02-20T18:40:58Z", "modifyDate": "2023-02-20T18:40:58Z", "tableName": "person", - "filterJson": "{\"filter\":{\"criteria\":[{\"fieldName\":\"firstName\",\"operator\":\"STARTS_WITH\",\"values\":[\"D\"]}],\"orderBys\":[{\"fieldName\":\"id\",\"isAscending\":false}],\"booleanOperator\":\"AND\"}}", + "viewJson": "{\"queryFilter\":{\"criteria\":[{\"fieldName\":\"firstName\",\"operator\":\"STARTS_WITH\",\"values\":[\"D\"]}],\"orderBys\":[{\"fieldName\":\"id\",\"isAscending\":false}],\"booleanOperator\":\"AND\"}}", "userId": "darin.kelkhoff@kingsrook.com" } }