Skip to content

Commit

Permalink
fix the last release
Browse files Browse the repository at this point in the history
  • Loading branch information
deanhiller committed Aug 18, 2016
1 parent c20dfff commit 8890a7f
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 3 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ httpclient - http client built on above core components
httpproxy - build on asyncserver and http client

TODO:
* get i18n working and then get it working with field.tag then getting it working with arrays and field.tag(which is harder)
* unit test arrays in multi-part form, query params! and test for flash working with arrays(not sure it will or not)
* unit test query param conflict with multipart, query param conflict with path param, and multipart param conflict with path param
* unit test query param conflict with multipart, query param conflict with path param, and multipart param conflict with path param. specifically createTree stuff PAramNode, etc.
* need to test out cookie length and 150 cookies of certain length
* write an escapehtml tag
* implement error, errorClass, errors, ifError, ifErrors, jsAction, jsRoute, option, select,
Expand Down
2 changes: 1 addition & 1 deletion webserver/http-templating/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sourceSets {
main {
resources {
srcDirs = ["src/main/java"]
includes = ["**/*.html", "**/*.tag", "**/*.txt", "**/*.xml"]
includes = ["**/*.html", "**/*.tag", "**/*.txt", "**/*.xml", "**/*.properties"]
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void setUp() throws InterruptedException, ClassNotFoundException {
//You must have firefox installed to run this test...
//@Ignore
@Test
public void testSomething() throws ClassNotFoundException {
public void testBasicForm() throws ClassNotFoundException {
driver.get("http://localhost:"+port+"/listusers");

String pageSource = driver.getPageSource();
Expand Down Expand Up @@ -92,6 +92,47 @@ public void testSomething() throws ClassNotFoundException {

}

// //You must have firefox installed to run this test...
// //@Ignore
// @Test
// public void testArrayFieldInForm() throws ClassNotFoundException {
// driver.get("http://localhost:"+port+"/arrayForm");
//
// String pageSource = driver.getPageSource();
// Assert.assertTrue("pageSource="+pageSource, pageSource.contains("Add User"));
//
// WebElement userInput = driver.findElement(By.name("user.firstName"));
// userInput.sendKeys("Dean Hiller");
//
// WebElement zipCodeInput = driver.findElement(By.name("user.address.zipCode"));
// zipCodeInput.sendKeys("Text instead of number");
//
// WebElement passwordElem = driver.findElement(By.name("password"));
// passwordElem.sendKeys("SomePassword");
//
// Assert.assertEquals("http://localhost:"+port+"/adduser", driver.getCurrentUrl());
//
// WebElement submit = driver.findElement(By.id("submit"));
// submit.submit();
//
// //ensure flash scope worked and what the user typed in is still there
// userInput = driver.findElement(By.name("user.firstName"));
// String userName = userInput.getAttribute("value");
// Assert.assertEquals("Dean Hiller", userName);
//
// passwordElem = driver.findElement(By.name("password"));
// String password = passwordElem.getAttribute("value");
// Assert.assertEquals("", password);
//
// WebElement errorSpan = driver.findElement(By.id("user_address_zipCode_errorMsg"));
// String errorMsg = errorSpan.getText();
// Assert.assertEquals("Could not convert value", errorMsg);
//
// System.out.println("hi there");
// //find the error element?...
//
// }

private class AppOverridesModule implements Module {
@Override
public void configure(Binder binder) {
Expand Down

0 comments on commit 8890a7f

Please sign in to comment.