From 0ad1f0d1479c0aa4806721457bee2588ad61acbf Mon Sep 17 00:00:00 2001
From: Nanne Baars <nanne.baars@owasp.org>
Date: Sun, 21 May 2017 13:28:29 +0200
Subject: [PATCH] Fixing Travis issues while building

---
 webgoat-container/src/main/resources/application.properties     | 2 +-
 .../src/test/java/org/owasp/webgoat/plugins/LessonTest.java     | 2 ++
 .../src/test/resources/application-test.properties              | 1 +
 .../org/owasp/webgoat/plugin/BlindSendFileAssignmentTest.java   | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 webgoat-container/src/test/resources/application-test.properties

diff --git a/webgoat-container/src/main/resources/application.properties b/webgoat-container/src/main/resources/application.properties
index 62b1b3dec..5ac2c63c3 100644
--- a/webgoat-container/src/main/resources/application.properties
+++ b/webgoat-container/src/main/resources/application.properties
@@ -18,7 +18,7 @@ spring.thymeleaf.cache=false
 
 webgoat.clean=true
 webgoat.server.directory=${user.home}/.webgoat/
-webgoat.user.directory=/tmp/
+webgoat.user.directory=${user.home}/.webgoat/
 webgoat.build.version=@project.version@
 webgoat.build.number=@build.number@
 webgoat.email=webgoat@owasp.org
diff --git a/webgoat-container/src/test/java/org/owasp/webgoat/plugins/LessonTest.java b/webgoat-container/src/test/java/org/owasp/webgoat/plugins/LessonTest.java
index 049d38697..07a0d272d 100644
--- a/webgoat-container/src/test/java/org/owasp/webgoat/plugins/LessonTest.java
+++ b/webgoat-container/src/test/java/org/owasp/webgoat/plugins/LessonTest.java
@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.embedded.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.context.WebApplicationContext;
 
@@ -20,6 +21,7 @@ import static org.mockito.Mockito.when;
  * @since 5/20/17.
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@TestPropertySource(locations = "classpath:/application-test.properties")
 public abstract class LessonTest {
 
     @LocalServerPort
diff --git a/webgoat-container/src/test/resources/application-test.properties b/webgoat-container/src/test/resources/application-test.properties
new file mode 100644
index 000000000..da678e27b
--- /dev/null
+++ b/webgoat-container/src/test/resources/application-test.properties
@@ -0,0 +1 @@
+webgoat.user.directory=/tmp/
\ No newline at end of file
diff --git a/webgoat-lessons/xxe/src/test/java/org/owasp/webgoat/plugin/BlindSendFileAssignmentTest.java b/webgoat-lessons/xxe/src/test/java/org/owasp/webgoat/plugin/BlindSendFileAssignmentTest.java
index c6257affe..9f31bf8eb 100644
--- a/webgoat-lessons/xxe/src/test/java/org/owasp/webgoat/plugin/BlindSendFileAssignmentTest.java
+++ b/webgoat-lessons/xxe/src/test/java/org/owasp/webgoat/plugin/BlindSendFileAssignmentTest.java
@@ -84,7 +84,7 @@ public class BlindSendFileAssignmentTest extends LessonTest {
                 .andDo(MockMvcResultHandlers.print())
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.feedback", CoreMatchers.is(messages.getMessage("assignment.solved"))))
-                .andExpect(jsonPath("$.output", CoreMatchers.is("Contents of the file is: GET Java/1.8.0_121 WebGoat 8 rocks...")));
+                .andExpect(jsonPath("$.output", CoreMatchers.containsString("WebGoat 8 rocks...")));
     }
 
 }
\ No newline at end of file