Skip to content

Commit

Permalink
Merge branch 'upgrade-to-htmlunit-2.27' of https://github.com/alexand…
Browse files Browse the repository at this point in the history
…er-kotlyar/selenide into alexander-kotlyar-upgrade-to-htmlunit-2.27

# Conflicts:
#	build.gradle
  • Loading branch information
asolntsev committed Sep 27, 2017
2 parents 6deda1f + 8a134a0 commit ae9d317
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Expand Up @@ -58,9 +58,9 @@ dependencies {
compile 'com.google.code.gson:gson:2.8.0'
compile 'com.google.guava:guava:21.0'
runtime 'commons-codec:commons-codec:1.10'
provided group: 'org.seleniumhq.selenium', name: 'htmlunit-driver', version: '2.24', transitive: false
provided group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.24', transitive: false
testRuntime group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.24', transitive: false
provided group: 'org.seleniumhq.selenium', name: 'htmlunit-driver', version: '2.27', transitive: false
provided group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.27', transitive: false
testRuntime group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.27', transitive: false
compile('net.lightbody.bmp:browsermob-core:2.1.5')
testRuntime group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25', transitive: false

Expand Down
7 changes: 1 addition & 6 deletions src/test/java/integration/SelenideMethodsTest.java
Expand Up @@ -114,12 +114,7 @@ public void toStringShowsAllAttributesButStyleSortedAlphabetically() {
public void toStringShowsValueAttributeThatHasBeenUpdatedDynamically() {
$("#age").clear();
$("#age").sendKeys("21");
if (isHtmlUnit()) {
assertEquals("<input id=\"age\" name=\"age\" value=\"21\"></input>", $("#age").toString());
}
else {
assertEquals("<input id=\"age\" name=\"age\" type=\"text\" value=\"21\"></input>", $("#age").toString());
}
assertEquals("<input id=\"age\" name=\"age\" type=\"text\" value=\"21\"></input>", $("#age").toString());
}

@Test
Expand Down

0 comments on commit ae9d317

Please sign in to comment.