hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update REST API tests

Browse Source 
Extended the relationship checks in the REST API tests to actually verify
that the returned objects represent what is expected.
This commit is contained in:
Markus Mäkelä
2017-10-23 11:28:25 +03:00
parent 582a65f77c
commit b7b50959ac
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
server/core/test/rest-api/test/monitor.js
View File

@ -48,30 +48,32 @@ describe("Monitor Relationships", function() {
}) })
it("remove relationships from old monitor", function() { it("remove relationships from old monitor", function() {
var mon = { data: {
return request.get(base_url + "/monitors/MySQL-Monitor") relationships: {
.then(function(resp) { servers: null
var mon = JSON.parse(resp) }}}
delete mon.data.relationships.servers return request.patch(base_url + "/monitors/MySQL-Monitor", {body: mon})
return request.patch(base_url + "/monitors/MySQL-Monitor", {json: mon}) .then(() => request.get(base_url + "/monitors/MySQL-Monitor", { json: true }))
}) .then((res) => {
.should.be.fulfilled res.data.relationships.servers.should.be.undefined
})
}); });
it("add relationships to new monitor", function() { it("add relationships to new monitor", function() {
var mon = { data: {
return request.get(base_url + "/monitors/" + monitor.data.id) relationships: {
.then(function(resp) { servers: [
var mon = JSON.parse(resp)
mon.data.relationships.servers = [
{id: "server1", type: "servers"}, {id: "server1", type: "servers"},
{id: "server2", type: "servers"}, {id: "server2", type: "servers"},
{id: "server3", type: "servers"}, {id: "server3", type: "servers"},
{id: "server4", type: "servers"}, {id: "server4", type: "servers"},
] ]
return request.patch(base_url + "/monitors/" + monitor.data.id, {json: mon}) }}}
return request.patch(base_url + "/monitors/" + monitor.data.id, {body: mon})
.then(() => request.get(base_url + "/monitors/" + monitor.data.id, { json: true }))
.then((res) => {
res.data.relationships.servers.data.should.have.lengthOf(4)
}) })
.should.be.fulfilled
}); });
it("move relationships back to old monitor", function() { it("move relationships back to old monitor", function() {

8
server/core/test/rest-api/test/server.js
View File

@ -57,14 +57,16 @@ describe("Server Relationships", function() {
var rel_server = JSON.parse(JSON.stringify(server)) var rel_server = JSON.parse(JSON.stringify(server))
rel_server.data.relationships = rel rel_server.data.relationships = rel
it("create new server", function() { it("create new server with relationships", function() {
return request.post(base_url + "/servers/", {json: rel_server}) return request.post(base_url + "/servers/", {json: rel_server})
.should.be.fulfilled .should.be.fulfilled
}); });
it("request server", function() { it("request server", function() {
return request.get(base_url + "/servers/" + rel_server.data.id) return request.get(base_url + "/servers/" + rel_server.data.id, { json: true })
.should.be.fulfilled .then((res) => {
res.data.relationships.services.data.should.have.lengthOf(2)
})
}); });
it("remove relationships", function() { it("remove relationships", function() {