From ddf004b733a66b3c3e019a974305e8803d2970be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Fri, 12 Apr 2019 12:58:14 +0300
Subject: [PATCH] MXS-2349: Extend REST API tests

Added tests to the REST API that make sure the `socket` parameter works.
---
 server/core/test/rest-api/test/server.js | 50 ++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/server/core/test/rest-api/test/server.js b/server/core/test/rest-api/test/server.js
index ca6cd7da2..ba1b81971 100644
--- a/server/core/test/rest-api/test/server.js
+++ b/server/core/test/rest-api/test/server.js
@@ -26,7 +26,29 @@ var rel = {
 describe("Server", function() {
     before(startMaxScale)
 
+    it("rejects new server with only `port`", function() {
+        delete server.data.attributes.parameters.address
+        return request.post(base_url + "/servers/", {json: server })
+            .should.be.rejected
+    });
+
+    it("rejects new server with both `address` and `socket`", function() {
+        server.data.attributes.parameters.address = '127.0.0.1'
+        server.data.attributes.parameters.socket = '/tmp/mysql.sock'
+        return request.post(base_url + "/servers/", {json: server })
+            .should.be.rejected
+    });
+
+    it("rejects new server with neither `address` nor `socket`", function() {
+        delete server.data.attributes.parameters.address
+        delete server.data.attributes.parameters.socket
+        return request.post(base_url + "/servers/", {json: server })
+            .should.be.rejected
+    });
+
     it("create new server", function() {
+        server.data.attributes.parameters.address = '127.0.0.1'
+        server.data.attributes.parameters.port = 3000
         return request.post(base_url + "/servers/", {json: server })
             .should.be.fulfilled
     });
@@ -42,6 +64,34 @@ describe("Server", function() {
             .should.be.fulfilled
     });
 
+    it("rejects invalid `address`", function() {
+        server.data.attributes.parameters.address = '/tmp/mysql.sock'
+        return request.patch(base_url + "/servers/" + server.data.id, { json: server})
+            .should.be.rejected
+    });
+
+    it("rejects invalid `port`", function() {
+        server.data.attributes.parameters.address = '127.0.0.1'
+        server.data.attributes.parameters.port = '/tmp/server.sock'
+        return request.patch(base_url + "/servers/" + server.data.id, { json: server})
+            .should.be.rejected
+    });
+
+    it("rejects `address` and `socket` in PATCH", function() {
+        server.data.attributes.parameters.address = '127.0.0.1'
+        server.data.attributes.parameters.socket = '/tmp/mysql.sock'
+        return request.patch(base_url + "/servers/" + server.data.id, { json: server})
+            .should.be.rejected
+    });
+
+    it("alters `address` to `socket` in PATCH", function() {
+        delete server.data.attributes.parameters.address
+        delete server.data.attributes.parameters.port
+        server.data.attributes.parameters.socket = '/tmp/mysql.sock'
+        return request.patch(base_url + "/servers/" + server.data.id, { json: server})
+            .should.be.fulfilled
+    });
+
     it("destroy server", function() {
         return request.delete(base_url + "/servers/" + server.data.id)
             .should.be.fulfilled