From 23369e9ae54988a3128d4d0b80e0be0eab71a799 Mon Sep 17 00:00:00 2001
From: Prabhjyot Singh <prabhjyotsingh@gmail.com>
Date: Sat, 4 Jun 2016 00:25:34 +0530
Subject: [PATCH] Fix flaky ZeppelinIT build

---
 .../apache/zeppelin/integration/ZeppelinIT.java  |  4 ++--
 .../interpreter-create/interpreter-create.html   | 16 ++++++++--------
 .../src/app/interpreter/interpreter.html         | 16 ++++++++--------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java
index 4ec3ee0e9d2..b3bb99fbb36 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java
@@ -238,8 +238,8 @@ public void testSparkInterpreterDependencyLoading() throws Exception {
       interpreterLink.click();
       driver.findElement(By.xpath("//div[@id='spark']//button[contains(.,'edit')]")).sendKeys(Keys.ENTER);
       WebElement testDepRemoveBtn = pollingWait(By.xpath("//tr[descendant::text()[contains(.,'" +
-          artifact + "')]]/td[3]/div"), MAX_IMPLICIT_WAIT);
-      testDepRemoveBtn.click();
+          artifact + "')]]/td[3]/button"), MAX_IMPLICIT_WAIT);
+      testDepRemoveBtn.sendKeys(Keys.ENTER);
       driver.findElement(By.xpath("//div[@id='spark']//form//button[1]")).click();
       driver.findElement(By.xpath("//div[@class='modal-dialog'][contains(.,'Do you want to update this interpreter and restart with new settings?')]" +
           "//div[@class='modal-footer']//button[contains(.,'OK')]")).click();
diff --git a/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html b/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html
index c46c1d1b900..f41dbfbaab5 100644
--- a/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html
+++ b/zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html
@@ -83,8 +83,8 @@ <h4>Create new interpreter</h4>
             <td><textarea msd-elastic ng-model="value.value"></textarea></td>
             <td>{{value.description}}</td>
             <td>
-              <div class="btn btn-default btn-sm fa fa-remove" ng-click="removeInterpreterProperty(key)">
-              </div>
+              <button class="btn btn-default btn-sm fa fa-remove" ng-click="removeInterpreterProperty(key)">
+              </button>
             </td>
           </tr>
 
@@ -96,8 +96,8 @@ <h4>Create new interpreter</h4>
             <td><textarea msd-elastic ng-model="newInterpreterSetting.propertyValue"></textarea></td>
             <td></td>
             <td>
-              <div class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterProperty()">
-              </div>
+              <button class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterProperty()">
+              </button>
             </td>
           </tr>
         </table>
@@ -121,9 +121,9 @@ <h4>Create new interpreter</h4>
               </textarea>
             </td>
             <td>
-              <div class="btn btn-default btn-sm fa fa-remove"
+              <button class="btn btn-default btn-sm fa fa-remove"
                    ng-click="removeInterpreterDependency(dep.groupArtifactVersion)">
-              </div>
+              </button>
             </td>
           </tr>
 
@@ -140,8 +140,8 @@ <h4>Create new interpreter</h4>
               </textarea>
             </td>
             <td>
-              <div class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterDependency()">
-              </div>
+              <button class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterDependency()">
+              </button>
             </td>
           </tr>
         </table>
diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html
index 655ef7a548d..24831bc9b81 100644
--- a/zeppelin-web/src/app/interpreter/interpreter.html
+++ b/zeppelin-web/src/app/interpreter/interpreter.html
@@ -175,9 +175,9 @@ <h5>Properties</h5>
               </span>
             </td>
             <td ng-if="valueform.$visible">
-              <div class="btn btn-default btn-sm fa fa-remove"
+              <button class="btn btn-default btn-sm fa fa-remove"
                    ng-click="removeInterpreterProperty(key, setting.id)">
-              </div>
+              </button>
             </td>
           </tr>
           <tr ng-if="valueform.$visible">
@@ -190,9 +190,9 @@ <h5>Properties</h5>
               <textarea msd-elastic ng-model="setting.propertyValue"></textarea>
             </td>
             <td>
-              <div class="btn btn-default btn-sm fa fa-plus"
+              <button class="btn btn-default btn-sm fa fa-plus"
                    ng-click="addNewInterpreterProperty(setting.id)">
-              </div>
+              </button>
             </td>
           </tr>
         </table>
@@ -227,9 +227,9 @@ <h5>Dependencies</h5>
               <div ng-if="!valueform.$visible">{{dep.exclusions.join()}}</div>
             </td>
             <td ng-if="valueform.$visible">
-              <div class="btn btn-default btn-sm fa fa-remove"
+              <button class="btn btn-default btn-sm fa fa-remove"
                    ng-click="removeInterpreterDependency(dep.groupArtifactVersion, setting.id)">
-              </div>
+              </button>
             </td>
           </tr>
           <tr ng-if="valueform.$visible">
@@ -246,9 +246,9 @@ <h5>Dependencies</h5>
               </textarea>
             </td>
             <td>
-              <div class="btn btn-default btn-sm fa fa-plus"
+              <button class="btn btn-default btn-sm fa fa-plus"
                    ng-click="addNewInterpreterDependency(setting.id)">
-              </div>
+              </button>
             </td>
           </tr>
         </table>