#165 method integrateViews() in tests should be called by default

Igor Polevoy · Igor Polevoy · commit f4c0b40a9e2d · 2015-06-21T21:53:54.000-05:00
diff --git a/activeweb-testing/src/main/java/org/javalite/activeweb/ControllerSpec.java b/activeweb-testing/src/main/java/org/javalite/activeweb/ControllerSpec.java
@@ -76,7 +76,7 @@ public void atStart() {
      * @return instance of <code>RequestBuilder</code> with convenience methods.
      */
     protected RequestBuilder request() {
-        return new RequestBuilder(controllerPath, session(), false);
+        return new RequestBuilder(controllerPath, session(), true);
     }
 
     /**
diff --git a/activeweb-testing/src/main/java/org/javalite/activeweb/IntegrationSpec.java b/activeweb-testing/src/main/java/org/javalite/activeweb/IntegrationSpec.java
@@ -27,7 +27,7 @@
 public class IntegrationSpec extends RequestSpecHelper {
 
     protected RequestBuilder controller(String controllerName){
-        return new RequestBuilder(controllerName, session(), false);
+        return new RequestBuilder(controllerName, session(), true);
     }
 
     protected void setTemplateLocation(String templateLocation){
diff --git a/activeweb-testing/src/test/java/app/controllers/BlankParameterControllerSpec.java b/activeweb-testing/src/test/java/app/controllers/BlankParameterControllerSpec.java
@@ -10,7 +10,7 @@ public class BlankParameterControllerSpec extends ControllerSpec {
 
     @Test
     public void shouldPassParameterWithBlankValue(){
-        request().param("flag1").get("index");
+        request(false).param("flag1").get("index");
 
         a(val("exists")).shouldBeTrue();
         a(val("flag1")).shouldEqual("");
diff --git a/activeweb-testing/src/test/java/app/controllers/ControllerSpecControllerSpec.java b/activeweb-testing/src/test/java/app/controllers/ControllerSpecControllerSpec.java
@@ -26,7 +26,7 @@ public class ControllerSpecControllerSpec extends ControllerSpec {
     @Test
     public void shouldAssignInformationOnPersonWithGET() {
 
-        request().param("id", "2").get("index"); //<<========== making a request to the controller.
+        request(false).param("id", "2").get("index"); //<<========== making a request to the controller.
 
         a(assigns().get("name")).shouldEqual("John");
         a(assigns().get("last_name")).shouldEqual("Silverman");
diff --git a/activeweb-testing/src/test/java/app/controllers/CookieControllerSpec.java b/activeweb-testing/src/test/java/app/controllers/CookieControllerSpec.java
@@ -35,15 +35,15 @@ public void shouldSendCookieInResponse(){
 
     @Test
     public void shouldReadCookieFromRequest(){
-        request().cookie(new Cookie("user", "Carl")).get("read_cookie");
+        request(false).cookie(new Cookie("user", "Carl")).get("read_cookie");
         a(val("user")).shouldBeEqual("Carl");
     }
 
     @Test
     public void shouldReadHttpOnlyCookie(){
         Cookie c = new Cookie("user", "Carl");
         c.setHttpOnly();
-        request().cookie(c).get("read_cookie");
+        request(false).cookie(c).get("read_cookie");
         a(val("http_only")).shouldBeTrue();
     }
 }
diff --git a/activeweb-testing/src/test/java/app/controllers/Defect52Spec.java b/activeweb-testing/src/test/java/app/controllers/Defect52Spec.java
@@ -17,7 +17,7 @@ public void before() {
 
     @Test(expected = SpecException.class)
     public void shouldShowExceptionBecauseIntegrateViewsWasNotCalled() {
-        controller("abc_person").get("index");
+        controller("abc_person").integrateViews(false).get("index");
         responseContent();//causes exception because integrateViews() was not called
     }
 
diff --git a/activeweb-testing/src/test/java/app/controllers/FormatControllerSpec.java b/activeweb-testing/src/test/java/app/controllers/FormatControllerSpec.java
@@ -27,7 +27,7 @@ public class FormatControllerSpec extends ControllerSpec {
 
     @Test
     public void shouldNotFail() {
-        request().format("xml").get("index");
+        request(false).format("xml").get("index");
         a(val("format")).shouldBeEqual("xml");
     }
 }
diff --git a/activeweb-testing/src/test/java/app/controllers/HeaderControllerSpec.java b/activeweb-testing/src/test/java/app/controllers/HeaderControllerSpec.java
@@ -26,14 +26,14 @@ public class HeaderControllerSpec extends ControllerSpec {
 
     @Test
     public void shouldPassHeaderFromTest(){
-        request().header("X-Requested-With", "XMLHttpRequest").get("index");
+        request(false).header("X-Requested-With", "XMLHttpRequest").get("index");
         a(assigns().get("isAjax").toString()).shouldBeEqual("true");
     }
 
 
     @Test
     public void shouldPassMultipleHeadersFromTest(){
-        request().headers("header1", "h1val", "header2", "h2val").get("test");
+        request(false).headers("header1", "h1val", "header2", "h2val").get("test");
 
         a(assigns().get("val1")).shouldBeEqual("h1val");
         a(assigns().get("val2")).shouldBeEqual("h2val");
diff --git a/activeweb-testing/src/test/java/app/controllers/RequestParamsControllerSpec.java b/activeweb-testing/src/test/java/app/controllers/RequestParamsControllerSpec.java
@@ -37,21 +37,21 @@ public void before(){
     }
     @Test
     public void shouldSendSingleParameter(){
-        request().param("name", "John").get("index");
+        request(false).param("name", "John").get("index");
         a(assigns().get("name")).shouldBeEqual("John");
     }
 
     @Test
     public void shouldSendMultipleParameters(){
-        request().params("first_name", "John", "last_name", "Smith").get("multi");
+        request(false).params("first_name", "John", "last_name", "Smith").get("multi");
         a(assigns().get("first_name")).shouldBeEqual("John");
         a(assigns().get("last_name")).shouldBeEqual("Smith");
     }
 
     @Test
     public void shouldSendMultipleValues(){
 
-        request().param("states", list("Illinois", "Alabama")).get("multi-values");
+        request(false).param("states", list("Illinois", "Alabama")).get("multi-values");
         a(assigns().get("states")).shouldBeA(List.class);
         List<String> states = (List<String>) assigns().get("states");
 
@@ -62,7 +62,7 @@ public void shouldSendMultipleValues(){
     @Test
     public void shouldSendSingleAndMultipleValues(){
 
-        request().params("name", "Anna", "states", list("Illinois", "Alabama")).get("single-multi-values");
+        request(false).params("name", "Anna", "states", list("Illinois", "Alabama")).get("single-multi-values");
         a(assigns().get("states")).shouldBeA(List.class);
         List<String> states = (List<String>) assigns().get("states");
 
diff --git a/activeweb-testing/src/test/java/app/controllers/SessionObjectConverterControllerSpec.java b/activeweb-testing/src/test/java/app/controllers/SessionObjectConverterControllerSpec.java
@@ -26,7 +26,7 @@ public class SessionObjectConverterControllerSpec extends ControllerSpec {
 
     @Test
     public void shouldConvertInSpec(){
-        request().get("in-spec");
+        request(false).get("in-spec");
         a(sessionObject("name")).shouldBeEqual("John");
         a(sessionInteger("int")).shouldBeEqual(1);
         a(sessionDouble("double")).shouldBeEqual(1);
@@ -44,7 +44,7 @@ public void shouldConvertInController(){
         session("long", 1);
         session("boolean", true);
 
-        request().get("in-controller");
+        request(false).get("in-controller");
 
         a(session("last_name", String.class)).shouldBeEqual("Smith");
 
diff --git a/activeweb-testing/src/test/java/app/controllers/XyzControllerSpec.java b/activeweb-testing/src/test/java/app/controllers/XyzControllerSpec.java
@@ -27,7 +27,7 @@ public class XyzControllerSpec extends IntegrationSpec {
 
     @Test
     public void shouldPrependControllerPathWithSlash(){
-        controller("xyz").get("index");
+        controller("xyz").integrateViews(false).get("index");
         a(assigns().get("path").toString().startsWith("/")).shouldBeTrue();        
     }
 }
diff --git a/activeweb-testing/src/test/java/org/javalite/activeweb/DeleteMethodRouteSpec.java b/activeweb-testing/src/test/java/org/javalite/activeweb/DeleteMethodRouteSpec.java
@@ -28,6 +28,6 @@ public class DeleteMethodRouteSpec extends IntegrationSpec{
     @Test
     public void shouldRouteToAppropriateDeleteMethod(){
 
-        controller("my_restful").param("_method", "DELETE").delete("destroy");
+        controller("my_restful").param("_method", "DELETE").integrateViews(false).delete("destroy");
     }
 }
diff --git a/activeweb-testing/src/test/java/org/javalite/activeweb/FilterRequestPropertiesSpec.java b/activeweb-testing/src/test/java/org/javalite/activeweb/FilterRequestPropertiesSpec.java
@@ -51,7 +51,7 @@ public void before() {
     @Test
     public void shouldSetProperPathValuesInRequest() {
         addFilter(StudentController.class, filter);
-        controller("/student").get("index");
+        controller("/student").integrateViews(false).get("index");
         a(filter.path).shouldBeEqual("/student/index");
         a(filter.method).shouldBeEqual("GET");
         a(filter.uri).shouldBeEqual("/student/index");
@@ -61,7 +61,7 @@ public void shouldSetProperPathValuesInRequest() {
     @Test
     public void shouldSetProperPathValuesInRequestToControllerInSubPackage() {
         addFilter(RegistrationController.class, filter);
-        controller("/level1/level2/registration").get("index");
+        controller("/level1/level2/registration").integrateViews(false).get("index");
         a(filter.path).shouldBeEqual("/level1/level2/registration/index");
         a(filter.method).shouldBeEqual("GET");
         a(filter.uri).shouldBeEqual("/level1/level2/registration/index");
diff --git a/activeweb-testing/src/test/java/org/javalite/activeweb/FlashTagSpec.java b/activeweb-testing/src/test/java/org/javalite/activeweb/FlashTagSpec.java
@@ -33,7 +33,7 @@ public void before(){
 
     @Test
     public void shouldPropagateFlashMessageToNextRequestOnly(){
-        controller("flashing").get("create");
+        controller("flashing").integrateViews(false).get("create");
         a(session().get("flasher")).shouldNotBeNull();
         a(flash("saved")).shouldBeEqual("your data has been saved");
 
@@ -49,26 +49,26 @@ public void shouldPropagateFlashMessageToNextRequestOnly(){
     @Test
     public void shouldPropagateFlashAsMap(){
 
-        controller("flashing").get("as-map");
+        controller("flashing").integrateViews(false).get("as-map");
         a(session().get("flasher")).shouldNotBeNull();
         a(flash("one")).shouldBeEqual(1);
         a(flash("two")).shouldBeEqual(2);
 
-        controller("flashing").get("index");
+        controller("flashing").integrateViews(false).get("index");
         a(flash("one")).shouldBeNull();
         a(flash("two")).shouldBeNull();
     }
 
     @Test
     public void shouldPropagateFlashAsVararg(){
 
-        controller("flashing").get("as-vararg");
+        controller("flashing").integrateViews(false).get("as-vararg");
 
         a(session().get("flasher")).shouldNotBeNull();
         a(flash("one")).shouldBeEqual(1);
         a(flash("two")).shouldBeEqual(2);
 
-        controller("flashing").get("index");
+        controller("flashing").integrateViews(false).get("index");
         a(flash("one")).shouldBeNull();
     }
 
diff --git a/activeweb-testing/src/test/java/org/javalite/activeweb/HeadersLogFilterSpec.java b/activeweb-testing/src/test/java/org/javalite/activeweb/HeadersLogFilterSpec.java
@@ -41,7 +41,7 @@ public void before(){
     @Test
     public void shouldPrintHeadersToLog(){
         SystemStreamUtil.replaceError();
-        controller("abc-person").header("bogus", "value").get("pass_values");
+        controller("abc-person").integrateViews(false).header("bogus", "value").get("pass_values");
         //request header:
         a(SystemStreamUtil.getSystemErr().contains("Header: bogus=value")).shouldBeTrue();
 
diff --git a/activeweb-testing/src/test/java/org/javalite/activeweb/IntegrateViewsSpec.java b/activeweb-testing/src/test/java/org/javalite/activeweb/IntegrateViewsSpec.java
@@ -0,0 +1,21 @@
+package org.javalite.activeweb;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * @author Igor Polevoy on 6/21/15.
+ */
+public class IntegrateViewsSpec extends IntegrationSpec {
+
+    @Before
+    public void before(){
+        setTemplateLocation("src/test/views");
+    }
+
+    @Test
+    public void shouldRenderWithoutCallingIntegrateViews(){
+        controller("student").integrateViews().get("index");
+        a(responseContent()).shouldBeEqual("hello");
+    }
+}
diff --git a/activeweb-testing/src/test/java/org/javalite/activeweb/IntegrationSpecSpec.java b/activeweb-testing/src/test/java/org/javalite/activeweb/IntegrationSpecSpec.java
@@ -33,7 +33,7 @@ public void before(){
     @Test
     public void shouldPropagateSessionObjectAcrossMultipleRequests(){
         controller("student").integrateViews().get("index");
-        controller("student").get("register");
+        controller("student").integrateViews(false).get("register");
 
         a(session().get("student_name")).shouldBeEqual("John");
         a(session().get("student_id")).shouldBeEqual("123");
diff --git a/activeweb-testing/src/test/java/org/javalite/activeweb/RequestParamsLogFilterSpec.java b/activeweb-testing/src/test/java/org/javalite/activeweb/RequestParamsLogFilterSpec.java
@@ -44,7 +44,7 @@ public void shouldPrintRequestPropertiesToLog(){
         PrintStream pout = new PrintStream(bout);
         System.setErr(pout) ;
 
-        controller("abc-person").param("bogus","val1").get("pass_values");
+        controller("abc-person").param("bogus","val1").integrateViews(false).get("pass_values");
         pout.flush();
         pout.close();
         a(bout.toString().contains("URI Full Path: /abc-person/pass_values")).shouldBeTrue();
diff --git a/activeweb-testing/src/test/java/org/javalite/activeweb/RequestPropertiesLogFilterSpec.java b/activeweb-testing/src/test/java/org/javalite/activeweb/RequestPropertiesLogFilterSpec.java
@@ -42,7 +42,7 @@ public void shouldPrintRequestParamsToLog(){
         PrintStream pout = new PrintStream(bout);
         System.setErr(pout) ;
 
-        controller("abc-person").param("bogus","val1").get("pass_values");
+        controller("abc-person").param("bogus","val1").integrateViews(false).get("pass_values");
         pout.flush();
         pout.close();
         a(bout.toString().contains("Param: bogus=val1")).shouldBeTrue();
diff --git a/activeweb-testing/src/test/java/org/javalite/activeweb/UploadControllerSpec.java b/activeweb-testing/src/test/java/org/javalite/activeweb/UploadControllerSpec.java
@@ -52,6 +52,7 @@ public void shouldUploadFile(){
         controller("upload")
                 .contentType("multipart/form-data")
                 .formItem("hello.txt", "file", true, "text/plain", "hello".getBytes())
+                .integrateViews(false)
                 .post("save");
 
         a(assigns().get("content")).shouldBeEqual("hello");

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public void atStart() {`
`76`	`76`	`* @return instance of <code>RequestBuilder</code> with convenience methods.`
`77`	`77`	`*/`
`78`	`78`	`protected RequestBuilder request() {`
`79`		`- return new RequestBuilder(controllerPath, session(), false);`
	`79`	`+ return new RequestBuilder(controllerPath, session(), true);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`public class IntegrationSpec extends RequestSpecHelper {`
`28`	`28`
`29`	`29`	`protected RequestBuilder controller(String controllerName){`
`30`		`- return new RequestBuilder(controllerName, session(), false);`
	`30`	`+ return new RequestBuilder(controllerName, session(), true);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`protected void setTemplateLocation(String templateLocation){`
Original file line number	Diff line number	Diff line change
`@@ -35,15 +35,15 @@ public void shouldSendCookieInResponse(){`
`35`	`35`
`36`	`36`	`@Test`
`37`	`37`	`public void shouldReadCookieFromRequest(){`
`38`		`- request().cookie(new Cookie("user", "Carl")).get("read_cookie");`
	`38`	`+ request(false).cookie(new Cookie("user", "Carl")).get("read_cookie");`
`39`	`39`	`a(val("user")).shouldBeEqual("Carl");`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Test`
`43`	`43`	`public void shouldReadHttpOnlyCookie(){`
`44`	`44`	`Cookie c = new Cookie("user", "Carl");`
`45`	`45`	`c.setHttpOnly();`
`46`		`- request().cookie(c).get("read_cookie");`
	`46`	`+ request(false).cookie(c).get("read_cookie");`
`47`	`47`	`a(val("http_only")).shouldBeTrue();`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public void before() {`
`17`	`17`
`18`	`18`	`@Test(expected = SpecException.class)`
`19`	`19`	`public void shouldShowExceptionBecauseIntegrateViewsWasNotCalled() {`
`20`		`- controller("abc_person").get("index");`
	`20`	`+ controller("abc_person").integrateViews(false).get("index");`
`21`	`21`	`responseContent();//causes exception because integrateViews() was not called`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public class FormatControllerSpec extends ControllerSpec {`
`27`	`27`
`28`	`28`	`@Test`
`29`	`29`	`public void shouldNotFail() {`
`30`		`- request().format("xml").get("index");`
	`30`	`+ request(false).format("xml").get("index");`
`31`	`31`	`a(val("format")).shouldBeEqual("xml");`
`32`	`32`	`}`
`33`	`33`	`}`