Merge remote-tracking branch 'origin/master'

gatling/chat/ChatSimulation.scala

@@ -73,5 +73,5 @@ class ChatSimulation extends Simulation {
                             | "messageContent":"Hei fra gatling"
                             |}""".stripMargin)))
 
-	setUp(scn.inject(atOnceUsers(100))).protocols(httpProtocol)
+	setUp(scn.inject(atOnceUsers(250))).protocols(httpProtocol)
 }

src/main/webapp/js/settings.js

@@ -8,7 +8,10 @@ document.getElementById("cancelButton").addEventListener("click", function(){
  */
 function editUser (event) {
     event.preventDefault();
-    let newInformation = {};
+    let newInformation = {
+        "username": document.getElementById('username').value,
+        "password": document.getElementById('password').value
+    };
 
     fetch('../api/user/'+sessionStorage.getItem("userId"), {
         method: "PUT",
@@ -20,9 +23,20 @@ function editUser (event) {
             if (response === true) {
                 alert("Bruker oppdatert");
                 window.location.href = "../app.html";
+                loadApplication(newInformation);
             } else {
                 alert("Brukernavn eksisterer fra før, vennligst skriv inn et nytt brukernavn");
             }
         })
         .catch(error => console.error(error));
 }
+/**
+ * Adds user information to sessionStorage and redirects to app.html
+ * @param user contains user information as a JSON object
+ */
+ function loadApplication(user){
+    sessionStorage.setItem("userId", user.userId);
+    sessionStorage.setItem("username", user.username);
+    window.location.href = "../app.html"
+
+}

src/test/java/UserResourceTest.java

@@ -42,7 +42,7 @@ public class UserResourceTest extends JerseyTest {
         assertEquals("application/json",output.getHeaderString("Content-type"));
     }
 
-    /*
+    
     @Test
     public void testEditUser () {
         user2.setUserId(10);
@@ -51,5 +51,5 @@ public class UserResourceTest extends JerseyTest {
         assertEquals("Should return status 200", 200, output.getStatus());
         assertEquals("application/json",output.getHeaderString("Content-type"));
         assertNotEquals("testUsername",user2.getUsername());
-    }*/
+    }
 }