From ddae25fda85335a18d00666946eec8c60f69d2e1 Mon Sep 17 00:00:00 2001
From: Sander Nicolausson <sandern@stud.ntnu.no>
Date: Tue, 25 Sep 2018 10:04:41 +0200
Subject: [PATCH] final fixes
---
dao/persondao.test.js | 27 ++++++++++++++-------------
server.js | 6 +++---
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/dao/persondao.test.js b/dao/persondao.test.js
index 277d42c..b87afbb 100644
--- a/dao/persondao.test.js
+++ b/dao/persondao.test.js
@@ -6,10 +6,10 @@ const runsqlfile = require("./runsqlfile.js");
// GitLab CI Pool
var pool = mysql.createPool({
connectionLimit: 1,
- host: "mysql",
- user: "root",
- password: "secret",
- database: "supertestdb",
+ host: "mysql.stud.iie.ntnu.no",
+ user: "sandern",
+ password: "KcL5ZgzU",
+ database: "sandern",
debug: false,
multipleStatements: true
});
@@ -78,29 +78,30 @@ test("get all persons from db", done => {
personDao.getAll(callback);
});
-test("delete person from db", done => {
+
+test("update person in db", done => {
function callback(status, data) {
console.log(
- "Test callback: status=" + status + ", data.length=" + data.length
+ "Test callback: status=" + status + ", data=" + JSON.stringify(data)
);
expect(data.affectedRows).toBeGreaterThanOrEqual(1);
done();
}
- personDao.deleteOne({id: 1}, callback);
+ personDao.updateOne(
+ { navn: "Donald Duck", adresse: "Apalveien 11", alder: 22, id: 1},
+ callback
+ );
});
-test("update person in db", done => {
+test("delete person from db", done => {
function callback(status, data) {
console.log(
- "Test callback: status=" + status + ", data=" + JSON.stringify(data)
+ "Test callback: status=" + status + ", data.length=" + data.length
);
expect(data.affectedRows).toBeGreaterThanOrEqual(1);
done();
}
- personDao.updateOne(
- { navn: "Donald Duck", adresse: "Apalveien 11", alder: 22, id: 1},
- callback
- );
+ personDao.deleteOne(2, callback);
});
diff --git a/server.js b/server.js
index 3fefa08..46fcabd 100644
--- a/server.js
+++ b/server.js
@@ -9,9 +9,9 @@ const PersonDao = require("./dao/persondao.js");
var pool = mysql.createPool({
connectionLimit: 2,
host: "mysql.stud.iie.ntnu.no",
- user: "nilstesd",
- password: "lqqWcMzq",
- database: "nilstesd",
+ user: "sandern",
+ password: "KcL5ZgzU",
+ database: "sandern",
debug: false
});
--
GitLab