Repository: zeppelin
Updated Branches:
refs/heads/master b02707975 -> e20f68be8
Revert layout change made by pr2356
### What is this PR for?
This PR reverts layout change made by #2356.
### What type of PR is it?
Fix
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Lee moon soo
Closes #2409 from Leemoonsoo/revert_layoutchange_from_pr2356 and squashes the
following commits:
2abb91a [Lee moon soo] revert changes on test
391c5d9 [Lee moon soo] revert layout change made by
https://github.com/apache/zeppelin/pull/2356
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/e20f68be
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/e20f68be
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/e20f68be
Branch: refs/heads/master
Commit: e20f68be8d874701bc9fbd0fadc3fa0699d3d2ca
Parents: b027079
Author: Lee moon soo
Authored: Sat Jun 10 16:14:22 2017 -0700
Committer: Lee moon soo
Committed: Thu Jun 15 22:32:14 2017 -0700
--
.../integration/ParagraphActionsIT.java | 14 +++
.../src/app/notebook/paragraph/paragraph.css| 16 +---
.../src/app/notebook/paragraph/paragraph.html | 41 +---
3 files changed, 36 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/e20f68be/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
--
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 414460b..fa5bed9 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
@@ -262,7 +262,7 @@ public class ParagraphActionsIT extends AbstractZeppelinIT {
}
try {
String xpathToRunOnSelectionChangeCheckbox = getParagraphXPath(1) +
"//ul/li/form/input[contains(@ng-checked, 'true')]";
- String xpathToDropdownMenu = "(" + (getParagraphXPath(1) +
"//select)[2]");
+ String xpathToDropdownMenu = getParagraphXPath(1) + "//select";
String xpathToResultText = getParagraphXPath(1) +
"//div[contains(@id,\"_html\")]";
createNewNote();
@@ -592,7 +592,7 @@ public class ParagraphActionsIT extends AbstractZeppelinIT {
driver.findElement(By.xpath(getParagraphXPath(1) +
"//div[contains(@class, 'text plainTextContent')]")).getText(),
CoreMatchers.equalTo("Howdy "));
- Select dropDownMenu = new Select(driver.findElement(By.xpath("(" +
(getParagraphXPath(1) + "//select)[2]";
+ Select dropDownMenu = new Select(driver.findElement(By.xpath("(" +
(getParagraphXPath(1) + "//select)[1]";
dropDownMenu.selectByVisibleText("Alice");
collector.checkThat("After selection in drop down menu, output should
display the newly selected option",
@@ -602,7 +602,7 @@ public class ParagraphActionsIT extends AbstractZeppelinIT {
driver.findElement(By.xpath(getParagraphXPath(1) +
"//span[@class='icon-settings']")).click();
clickAndWait(By.xpath(getParagraphXPath(1) +
"//ul/li/form/input[contains(@ng-checked, 'true')]"));
- Select sameDropDownMenu = new Select(driver.findElement(By.xpath("(" +
(getParagraphXPath(1) + "//select)[2]";
+ Select sameDropDownMenu = new Select(driver.findElement(By.xpath("(" +
(getParagraphXPath(1) + "//select)[1]";
sameDropDownMenu.selectByVisibleText("Bob");
collector.checkThat("After 'Run on selection change' checkbox is
unchecked, the paragraph should not run if selecting a different option",
driver.findElement(By.xpath(getParagraphXPath(1) +
"//div[contains(@class, 'text plainTextContent')]")).getText(),
@@ -632,7 +632,7 @@ public class ParagraphActionsIT extends AbstractZeppelinIT {
driver.findElement(By.xpath(getParagraphXPath(1) +
"//div[contains(@class, 'text plainTextContent')]")).getText(),
CoreMatchers.containsString("Greetings han and leia and luke"));
- WebElement firstCheckbox = driver.findElement(By.xpath("(" +
getParagraphXPath(1) + "//input[@type='checkbox'])[2]"));
+ WebElement firstCheckbox = driver.findElement(By.xpath("(" +
getParagraphXPath(1) + "//input[@type='checkbox'])[1]"));
firstCheckbox.click();
collector.checkThat("After unchecking one of the boxes, we can see the
newly updated output without the option we unchecked",
driver.findElement(By.xpath(getParagraphXPath(1) +
"//div[contains(@class, 'text p