Merge branch 'master' of github.com:caelum/brutal

.gitignore

@@ -27,3 +27,4 @@ src/main/webapp/font/
 src/main/webapp/js/jquery/jquery-plugins*.js
 versions.txt
 /target
+jsp-compilation

pom.xml

@@ -24,7 +24,7 @@
 		<dependency>
 			<groupId>br.com.caelum</groupId>
 			<artifactId>vraptor</artifactId>
-			<version>4.0.0-beta-3-SNAPSHOT</version>
+			<version>4.0.0-beta-3</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.hamcrest</groupId>
@@ -42,17 +42,13 @@
 					<groupId>org.hamcrest</groupId>
 					<artifactId>hamcrest-integration</artifactId>
 				</exclusion>
-				<exclusion>
-					<artifactId>guava</artifactId>
-					<groupId>com.google.guava</groupId>
-				</exclusion>
 			</exclusions>
 		</dependency>
-        <dependency>
-            <groupId>org.jboss.weld.servlet</groupId>
-            <artifactId>weld-servlet</artifactId>
-            <version>2.1.0.Final</version>
-        </dependency>
+		<dependency>
+			<groupId>org.jboss.weld.servlet</groupId>
+			<artifactId>weld-servlet</artifactId>
+			<version>2.1.0.Final</version>
+		</dependency>
 
 		<!-- VRaptor plugins -->
 		<dependency>
@@ -133,6 +129,7 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
 		<!-- end of VRaptor plugins -->
 
 		<!-- hibernate deps -->
@@ -158,9 +155,9 @@
 			<version>5.0.0.Final</version>
 		</dependency>
 		<dependency>
-		    <groupId>org.hibernate</groupId>
-		    <artifactId>hibernate-validator-cdi</artifactId>
-		    <version>5.0.0.Final</version>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator-cdi</artifactId>
+			<version>5.0.0.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
@@ -391,6 +388,12 @@
 		<!-- end of jetty/container deps -->
 
 		<!-- TEST DEPENDENCIES -->
+		<dependency>
+			<groupId>br.com.caelum.vraptor</groupId>
+			<artifactId>vraptor-test</artifactId>
+			<version>2.0.0</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -445,6 +448,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.jsoup</groupId>
+			<artifactId>jsoup</artifactId>
+			<version>1.7.3</version>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -635,7 +643,8 @@
 		</plugins>
 		<pluginManagement>
 			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				<!--This plugin's configuration is used to store Eclipse m2e settings 
+					only. It has no influence on the Maven build itself. -->
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>

src/integration/java/br/com/caelum/brutal/integration/scene/vraptor/AnswerQuestionTest.java

@@ -0,0 +1,81 @@
+package br.com.caelum.brutal.integration.scene.vraptor;
+
+import static br.com.caelum.vraptor.test.http.Parameters.initWith;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jsoup.select.Elements;
+import org.junit.Assert;
+import org.junit.Test;
+
+import br.com.caelum.brutal.model.Answer;
+import br.com.caelum.brutal.model.AnswerAndVotes;
+import br.com.caelum.brutal.model.Question;
+import br.com.caelum.vraptor.test.VRaptorTestResult;
+import br.com.caelum.vraptor.test.requestflow.UserFlow;
+
+public class AnswerQuestionTest extends CustomVRaptorIntegration {
+
+	@Test
+	public void should_answer_when_logged_in() {
+		Question question = createQuestionWithDao(moderator(),
+				"Titulo da questao hahaha",
+				"Descricao da questao longa demais", tag("java"));
+
+		String description = "Resposta da questao do teste de edicao";
+
+		UserFlow navigation = login(navigate(), "karma.nigga@caelum.com.br");
+		navigation = answerQuestionWithFlow(navigation, question, description, false);
+
+		VRaptorTestResult questionAnswered = navigation.followRedirect().execute();
+		questionAnswered.wasStatus(200).isValid();
+
+		AnswerAndVotes answerAndVotes = questionAnswered.getObject("answers");
+		List<Answer> answers = new ArrayList<Answer>(answerAndVotes.getVotes().keySet());
+		Assert.assertEquals(description, answers.get(0).getDescription());
+	}
+
+	@Test
+	public void should_not_display_answer_form_when_not_logged_in() {
+		Question question = createQuestionWithDao(moderator(),
+				"Titulo da questao hahaha",
+				"Descricao da questao longa demais", tag("java"));
+
+		UserFlow navigation = goToQuestionPage(navigate(), question);
+
+		VRaptorTestResult questionPage = navigation.followRedirect().execute();
+		questionPage.wasStatus(200).isValid();
+
+		Elements answerForm = getElementsByClass(questionPage.getResponseBody(), "answer-form");
+		assertTrue(answerForm.isEmpty());
+	}
+
+	@Test
+	public void should_not_display_answer_form_when_already_answered() {
+		Question question = createQuestionWithDao(moderator(),
+				"Titulo da questao hahaha",
+				"Descricao da questao longa demais", tag("java"));
+
+		answerQuestionWithDao(karmaNigga(), question,
+				"Resposta da questao do teste de edicao", false);
+
+		UserFlow navigation = login(navigate(), "karma.nigga@caelum.com.br");
+		navigation = goToQuestionPage(navigation, question);
+
+		VRaptorTestResult questionPage = navigation.followRedirect().execute();
+		questionPage.wasStatus(200).isValid();
+
+		Elements answerForm = getElementsByClass(questionPage.getResponseBody(), "answer-form");
+		assertTrue(answerForm.isEmpty());
+	}
+
+	private UserFlow goToQuestionPage(UserFlow navigation, Question question) {
+		String url = String.format("/%s-mock", question.getId());
+		return navigation.get(url,
+				initWith("question", question)
+					.add("sluggedTitle", question.getSluggedTitle()));
+	}
+
+}

src/integration/java/br/com/caelum/brutal/integration/scene/vraptor/CommentAnswerTest.java

@@ -0,0 +1,11 @@
+package br.com.caelum.brutal.integration.scene.vraptor;
+
+import org.junit.Test;
+
+public class CommentAnswerTest extends CustomVRaptorIntegration {
+
+	@Test
+	public void should_comment_answer_after_login() throws Exception {
+
+	}
+}