Merge branch 'grabowski/authentication-tests'

* grabowski/authentication-tests: app: tests: use CSRF token from 'wrong' site app: tests: add rest of authentication tests app: tests: part of the admin tests
Geend · Dec 9, 2018 · b0cb5e7 · b0cb5e7
2 parents ace08ba + 02cb43c
commit b0cb5e7
Show file tree

Hide file tree

Showing 2 changed files with 266 additions and 31 deletions.
diff --git a/src/app/extension/test/WSTestClientStateful.java b/src/app/extension/test/WSTestClientStateful.java
@@ -15,10 +15,12 @@
 public class WSTestClientStateful {
     private WSClient ws;
     private List<WSCookie> cookies;
+    private boolean followRedirects;
 
     public WSTestClientStateful(int port) {
         this.ws =  WSTestClient.newClient(port);
         this.cookies = new ArrayList<>();
+        followRedirects = false;
     }
 
     private void updateCookies(WSResponse response) {
@@ -31,19 +33,23 @@ private void updateCookies(WSResponse response) {
     }
 
     public WSResponse get(String url) throws ExecutionException, InterruptedException {
-        WSResponse response = ws.url(url).setCookies(cookies).get().toCompletableFuture().get();
+        WSResponse response = ws.url(url).setFollowRedirects(followRedirects).setCookies(cookies).get().toCompletableFuture().get();
         updateCookies(response);
         return response;
     }
 
     public WSResponse post(String url, List<NameValuePair> parameter) throws ExecutionException, InterruptedException {
         String encParameters = URLEncodedUtils.format(parameter, "utf-8");
-        WSResponse response = ws.url(url).setCookies(cookies).setContentType("application/x-www-form-urlencoded").post(encParameters).toCompletableFuture().get();
+        WSResponse response = ws.url(url).setFollowRedirects(followRedirects).setCookies(cookies).setContentType("application/x-www-form-urlencoded").post(encParameters).toCompletableFuture().get();
         updateCookies(response);
         return response;
     }
 
     public void close() throws IOException {
         ws.close();
     }
+
+    public void setFollowRedirects(boolean value) {
+        followRedirects = value;
+    }
 }