Merge branch 'release/6.10' into cherrypick-1249

cdapio · Nov 26, 2024 · f085861 · f085861
2 parents 555071f + a36d9b0
commit f085861
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/e2e-test/java/io/cdap/cdap/ui/stepsdesign/WidgetCodeEditor.java b/src/e2e-test/java/io/cdap/cdap/ui/stepsdesign/WidgetCodeEditor.java
@@ -65,8 +65,8 @@ public void verifyDefaultJSEditorValue() {
         WebElement jsEditorContentElement = jsEditorElement.findElement(
                 By.cssSelector("div[class*='ace_text-layer']"));
         String editorValue = ElementHelper.getElementText(jsEditorContentElement);
-        Assert.assertEquals(StringUtils.normalizeSpace(editorValue),
-                StringUtils.normalizeSpace(defaultJsEditorVal));
+        Assert.assertEquals(defaultJsEditorVal.replaceAll("\\s+", ""),
+            editorValue.replaceAll("\\s+", ""));
     }
 
     @Then("Replace and verify JS editor value and cursor position")

diff --git a/src/e2e-test/java/io/cdap/cdap/ui/utils/Commands.java b/src/e2e-test/java/io/cdap/cdap/ui/utils/Commands.java
@@ -185,7 +185,11 @@ public static void fillConnectionCreateForm(String connectionType, String connec
   }
 
   public static void dismissStudioLeaveConfirmationModal() {
-    SeleniumDriver.getDriver().switchTo().alert().accept();
+    try {
+      SeleniumDriver.getDriver().switchTo().alert().accept();
+    } catch (NoAlertPresentException e) {
+      // ignore it.
+    }
   }
 
   public static void openPluginGroupPanel(String pluginGroup) {