From c9231087fbde2867e723ea92250014839e5e51ee Mon Sep 17 00:00:00 2001 From: Damien CORNEAU Date: Wed, 15 Jun 2016 16:07:48 +0900 Subject: [PATCH 1/3] Trying to make test fail like the master --- .../java/org/apache/zeppelin/integration/ParagraphActionsIT.java | 1 + 1 file changed, 1 insertion(+) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java index d1135c052fb..22ae94e4a31 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java @@ -83,6 +83,7 @@ public void testCreateNewButton() throws Exception { driver.findElement(By.xpath(getParagraphXPath(1) + "//span[@class='icon-settings']")).click(); driver.findElement(By.xpath(getParagraphXPath(1) + "//ul/li/a[@ng-click='removeParagraph()']")).click(); ZeppelinITUtils.sleep(1000, false); + driver.findElement(By.xpath("//div[@class='modal-dialog'][contains(.,'delete this paragraph')]" + "//div[@class='modal-footer']//button[contains(.,'OK')]")).click(); ZeppelinITUtils.sleep(1000, false); From edc7e2d2b3f66be0f5aa088f3e4d2c533f6c42f7 Mon Sep 17 00:00:00 2001 From: Damien CORNEAU Date: Wed, 15 Jun 2016 16:55:14 +0900 Subject: [PATCH 2/3] Make some change to xpath --- .../integration/ParagraphActionsIT.java | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java index 22ae94e4a31..7dc6f7e77be 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java @@ -83,9 +83,14 @@ public void testCreateNewButton() throws Exception { driver.findElement(By.xpath(getParagraphXPath(1) + "//span[@class='icon-settings']")).click(); driver.findElement(By.xpath(getParagraphXPath(1) + "//ul/li/a[@ng-click='removeParagraph()']")).click(); ZeppelinITUtils.sleep(1000, false); - - driver.findElement(By.xpath("//div[@class='modal-dialog'][contains(.,'delete this paragraph')]" + - "//div[@class='modal-footer']//button[contains(.,'OK')]")).click(); + + Integer deleteParagaphModal = driver.findElements(By.xpath("//div[@class='modal-dialog'][contains(. ,'delete this paragraph?')]")).size(); + collector.checkThat("Before delete paragraph, Modal is shown", + deleteParagaphModal, + CoreMatchers.equalTo(1)); + + driver.findElement(By.xpath("//div[@class='modal-footer']//button[contains(text() ,'OK')]")).click(); + ZeppelinITUtils.sleep(1000, false); setTextOfParagraph(1, " original paragraph "); @@ -151,8 +156,15 @@ public void testRemoveButton() throws Exception { driver.findElement(By.xpath(getParagraphXPath(1) + "//span[@class='icon-settings']")).click(); driver.findElement(By.xpath(getParagraphXPath(1) + "//ul/li/a[@ng-click='removeParagraph()']")).click(); sleep(1000, true); - driver.findElement(By.xpath("//div[@class='modal-dialog'][contains(.,'delete this paragraph')]" + - "//div[@class='modal-footer']//button[contains(.,'OK')]")).click(); + + Integer deleteParagaphModal = driver.findElements(By.xpath("//div[@class='modal-dialog'][contains(. ,'delete this paragraph')]")).size(); + collector.checkThat("Before delete paragraph, Modal is shown", + deleteParagaphModal, + CoreMatchers.equalTo(1)); + + driver.findElement(By.xpath("//div[@class='modal-footer']//button[contains(text() ,'OK')]")).click(); + ZeppelinITUtils.sleep(1000, false); + Integer newNosOfParas = driver.findElements(By.xpath("//div[@ng-controller=\"ParagraphCtrl\"]")).size(); collector.checkThat("After Remove : Number of paragraphs are", oldNosOfParas-1, From 13aa1e11eba6f7388b17776a942ddc70b4a372be Mon Sep 17 00:00:00 2001 From: Damien CORNEAU Date: Wed, 15 Jun 2016 17:54:16 +0900 Subject: [PATCH 3/3] change modal button class target --- .../org/apache/zeppelin/integration/ParagraphActionsIT.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java index 7dc6f7e77be..dae0d91c98a 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java @@ -89,7 +89,7 @@ public void testCreateNewButton() throws Exception { deleteParagaphModal, CoreMatchers.equalTo(1)); - driver.findElement(By.xpath("//div[@class='modal-footer']//button[contains(text() ,'OK')]")).click(); + driver.findElement(By.xpath("//div[@class='bootstrap-dialog-footer']//button[contains(text() ,'OK')]")).click(); ZeppelinITUtils.sleep(1000, false); @@ -162,7 +162,8 @@ public void testRemoveButton() throws Exception { deleteParagaphModal, CoreMatchers.equalTo(1)); - driver.findElement(By.xpath("//div[@class='modal-footer']//button[contains(text() ,'OK')]")).click(); + + driver.findElement(By.xpath("//div[@class='bootstrap-dialog-footer']//button[contains(text() ,'OK')]")).click(); ZeppelinITUtils.sleep(1000, false); Integer newNosOfParas = driver.findElements(By.xpath("//div[@ng-controller=\"ParagraphCtrl\"]")).size();