From b95c1506670353768d27827cfc4050a58d711faf Mon Sep 17 00:00:00 2001 From: labkey-nicka Date: Tue, 25 Feb 2025 13:10:38 -0800 Subject: [PATCH 1/4] KnitrReportTest: use checkExpectedErrors() instead of pause/resume JS error checks --- src/org/labkey/test/tests/KnitrReportTest.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/org/labkey/test/tests/KnitrReportTest.java b/src/org/labkey/test/tests/KnitrReportTest.java index 3b3ba0feb6..80708e982d 100644 --- a/src/org/labkey/test/tests/KnitrReportTest.java +++ b/src/org/labkey/test/tests/KnitrReportTest.java @@ -199,13 +199,10 @@ private void verifyAdhocReportDependencies(String viewName, String dependencies) createKnitrReport(rmdDependenciesReport, RReportHelper.ReportOption.knitrMarkdown); - pauseJsErrorChecker(); // Don't fail due to "$ is not a function" - { - _rReportHelper.clickReportTab(); - waitForElement(Locator.id("mtcars_table")); - assertElementNotPresent(Locator.id("mtcars_table_wrapper")); // Created by jQuery - } - resumeJsErrorChecker(); + _rReportHelper.clickReportTab(); + waitForElement(Locator.id("mtcars_table")); + assertElementNotPresent(Locator.id("mtcars_table_wrapper")); // Created by jQuery + checkExpectedErrors(1); // JavaScript error: "$(...).dataTable is not a function" // now set the dependencies _rReportHelper.clickSourceTab(); From 34f65219648e3fc595efe22424468d8f896a0f7d Mon Sep 17 00:00:00 2001 From: labkey-nicka Date: Tue, 25 Feb 2025 14:10:28 -0800 Subject: [PATCH 2/4] Utilize getServerErrorCount() --- src/org/labkey/test/tests/KnitrReportTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/KnitrReportTest.java b/src/org/labkey/test/tests/KnitrReportTest.java index 80708e982d..63ec9bbbae 100644 --- a/src/org/labkey/test/tests/KnitrReportTest.java +++ b/src/org/labkey/test/tests/KnitrReportTest.java @@ -199,10 +199,11 @@ private void verifyAdhocReportDependencies(String viewName, String dependencies) createKnitrReport(rmdDependenciesReport, RReportHelper.ReportOption.knitrMarkdown); + int errorCountBefore = getServerErrorCount(); _rReportHelper.clickReportTab(); waitForElement(Locator.id("mtcars_table")); assertElementNotPresent(Locator.id("mtcars_table_wrapper")); // Created by jQuery - checkExpectedErrors(1); // JavaScript error: "$(...).dataTable is not a function" + checkExpectedErrors(errorCountBefore + 1); // JavaScript error: "$(...).dataTable is not a function" // now set the dependencies _rReportHelper.clickSourceTab(); From 350e84e3753c56c51e0e00f20c19783092190dcb Mon Sep 17 00:00:00 2001 From: Nick Kerr Date: Tue, 25 Feb 2025 14:59:23 -0800 Subject: [PATCH 3/4] Assert and checkExpectedErrors(1) Co-authored-by: Trey Chadick --- src/org/labkey/test/tests/KnitrReportTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/labkey/test/tests/KnitrReportTest.java b/src/org/labkey/test/tests/KnitrReportTest.java index 63ec9bbbae..5c471abcef 100644 --- a/src/org/labkey/test/tests/KnitrReportTest.java +++ b/src/org/labkey/test/tests/KnitrReportTest.java @@ -199,11 +199,11 @@ private void verifyAdhocReportDependencies(String viewName, String dependencies) createKnitrReport(rmdDependenciesReport, RReportHelper.ReportOption.knitrMarkdown); - int errorCountBefore = getServerErrorCount(); _rReportHelper.clickReportTab(); waitForElement(Locator.id("mtcars_table")); assertElementNotPresent(Locator.id("mtcars_table_wrapper")); // Created by jQuery - checkExpectedErrors(errorCountBefore + 1); // JavaScript error: "$(...).dataTable is not a function" + Assertions.assertThat(getServerErrors()).as("Server errors").contains("$(...).dataTable is not a function"); + checkExpectedErrors(1); // JavaScript error: "$(...).dataTable is not a function" // now set the dependencies _rReportHelper.clickSourceTab(); From 992a8966730c0909789ddc1caea0f17c8ea8f184 Mon Sep 17 00:00:00 2001 From: labkey-nicka Date: Tue, 25 Feb 2025 16:01:11 -0800 Subject: [PATCH 4/4] Fix import --- src/org/labkey/test/tests/KnitrReportTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/org/labkey/test/tests/KnitrReportTest.java b/src/org/labkey/test/tests/KnitrReportTest.java index 5c471abcef..af2f345626 100644 --- a/src/org/labkey/test/tests/KnitrReportTest.java +++ b/src/org/labkey/test/tests/KnitrReportTest.java @@ -16,6 +16,7 @@ package org.labkey.test.tests; import org.apache.hc.core5.http.HttpStatus; +import org.assertj.core.api.Assertions; import org.jetbrains.annotations.Nullable; import org.junit.Assume; import org.junit.Test;