Permalink
Browse files

updated controller

  • Loading branch information...
1 parent 7d6886e commit aa4997b8682c3286bbaae675359942fca6f3b1bd @jamesward committed Apr 1, 2015
Showing with 4 additions and 5 deletions.
  1. +1 −1 app/controllers/Application.java
  2. +2 −3 test/ApplicationTest.java
  3. +1 −1 test/IntegrationTest.java
@@ -8,7 +8,7 @@
public class Application extends Controller {
public static Result index() {
- return ok(index.render("Your new application is ready."));
+ return ok(index.render("hello, world"));
}
}
@@ -36,10 +36,9 @@ public void simpleCheck() {
@Test
public void renderTemplate() {
- Content html = views.html.index.render("Your new application is ready.");
+ Content html = views.html.index.render("hello, world");
assertThat(contentType(html)).isEqualTo("text/html");
- assertThat(contentAsString(html)).contains("Your new application is ready.");
+ assertThat(contentAsString(html)).contains("hello, world");
}
-
}
@@ -20,7 +20,7 @@ public void test() {
running(testServer(3333, fakeApplication(inMemoryDatabase())), HTMLUNIT, new Callback<TestBrowser>() {
public void invoke(TestBrowser browser) {
browser.goTo("http://localhost:3333");
- assertThat(browser.pageSource()).contains("Your new application is ready.");
+ assertThat(browser.pageSource()).contains("hello, world");
}
});
}

0 comments on commit aa4997b

Please sign in to comment.