aboutsummaryrefslogtreecommitdiff
path: root/juick-www/src
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-02-23 18:13:11 +0300
committerGravatar Vitaly Takmazov2018-02-23 18:13:11 +0300
commit21f5b034cffe99ceffcab4679d4ee26aa4c6b07c (patch)
tree34b2e804b6bdccc426a4bd6e1d76039144d6ddd3 /juick-www/src
parent023c0e62aeadf600f9d9ebffc6bb5392c8e387fd (diff)
fix tests under macOS
Diffstat (limited to 'juick-www/src')
-rw-r--r--juick-www/src/main/java/com/juick/www/controllers/NewMessage.java4
-rw-r--r--juick-www/src/test/java/com/juick/www/WebAppTests.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java b/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
index e652b4d5..4d3b4351 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
@@ -68,9 +68,9 @@ public class NewMessage {
private PMQueriesService pmQueriesService;
@Inject
private WebApp webApp;
- @Value("${img_path:#{systemEnvironment['TEMP']}}")
+ @Value("${img_path:#{systemEnvironment['TEMP'] ?: '/tmp'}}")
private String imgDir;
- @Value("${upload_tmp_dir:#{systemEnvironment['TEMP']}}")
+ @Value("${upload_tmp_dir:#{systemEnvironment['TEMP'] ?: '/tmp'}}")
private String tmpDir;
private static final Logger logger = LoggerFactory.getLogger(NewMessage.class);
diff --git a/juick-www/src/test/java/com/juick/www/WebAppTests.java b/juick-www/src/test/java/com/juick/www/WebAppTests.java
index e3ac53cf..af6b3f89 100644
--- a/juick-www/src/test/java/com/juick/www/WebAppTests.java
+++ b/juick-www/src/test/java/com/juick/www/WebAppTests.java
@@ -122,7 +122,7 @@ public class WebAppTests {
@Inject
private PebbleEngine pebbleEngine;
- @Value("${img_path:#{systemEnvironment['TEMP']}}")
+ @Value("${img_path:#{systemEnvironment['TEMP'] ?: '/tmp'}}")
private String imgPath;
private static User ugnich, freefd;