Skip to content
Snippets Groups Projects
Commit a2395c46 authored by student's avatar student
Browse files
Task 4 done through Ubuntu, 250 User load test
Merge caused by some change
parents 347946d9 49e4bed3
No related branches found
No related tags found
No related merge requests found
Pipeline #115278 failed
package resources;
<<<<<<< HEAD
=======
>>>>>>> 794a6583a949557859a601f9399dfb3bbf0def40
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
......
......@@ -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"
}
......@@ -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());
}*/
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment