From b22719f8668edebb58c424a03233f33107f7ee38 Mon Sep 17 00:00:00 2001
From: Mahmoud Ibrahim <mahmouim@stud.ntnu.no>
Date: Tue, 24 Sep 2019 15:11:22 +0200
Subject: [PATCH] Testing update and delete person
---
dao/persondao.js | 8 +-------
dao/persondao.test.js | 10 +++++-----
server.js | 8 +-------
3 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/dao/persondao.js b/dao/persondao.js
index f843bb3..f752688 100644
--- a/dao/persondao.js
+++ b/dao/persondao.js
@@ -22,11 +22,10 @@ module.exports = class PersonDao extends Dao {
);
}
- updateOne(id,nyNavn, callback) {
+ updateOne(json, callback) {
super.query(
"update person set navn=nynavn where id=?",
[id],
- [nyNavn],
callback
);
}
@@ -37,9 +36,4 @@ module.exports = class PersonDao extends Dao {
callback
);
}
- countAll(callback){
- super.query(
- "SELECT COUNT(*) FROM person;",[],callback
- )
- }
};
diff --git a/dao/persondao.test.js b/dao/persondao.test.js
index 9731cb4..f08ac0a 100644
--- a/dao/persondao.test.js
+++ b/dao/persondao.test.js
@@ -83,20 +83,20 @@ test("oppdater person to db", done => {
console.log(
"Test callback: status=" + status + ", data=" + JSON.stringify(data)
);
- expect(data.affectedRows).toBe(1);
+ expect(data.affectedRows).toEqual(1);
done();
}
- personDao.updateOne(
- 2,{navn: "Mahmoud"},callback);
+ personDao.updateOne({navn:"mahmoud",id:"2"}
+ ,callback);
});
test("slett person to db", done => {
- function callback(status) {
+ function callback(status, data) {
console.log(
"Test callback: status=" + status + ", data=" + JSON.stringify(data)
);
- expect(personDao.countAll((status, data))).toEqual(1);
+ expect(data.affectedRows).toBeGreaterThanOrEqual(1);
done();
}
diff --git a/server.js b/server.js
index 80cba75..41bd81e 100644
--- a/server.js
+++ b/server.js
@@ -57,12 +57,6 @@ app.delete("/person/:personId", (req, res) => {
});
});
-app.get("/person", (req, res) => {
- console.log("/person: fikk request fra klient");
- personDao.countAll((status, data) => {
- res.status(status);
- res.json(data);
- });
-});
+
var server = app.listen(8080);
--
GitLab