From ac8b3391d77ae7bab106156575027e16449cc0d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Tue, 15 Aug 2017 20:22:57 -0700
Subject: [PATCH] Re-use ajax mocks instead of creating one per response

---
 assets/static/__mocks__/ajaxErrorMock.js   | 16 ----------------
 assets/static/__mocks__/ajaxSuccessMock.js | 12 ------------
 assets/static/unsilence.test.js            | 17 +++++++++++------
 3 files changed, 11 insertions(+), 34 deletions(-)
 delete mode 100644 assets/static/__mocks__/ajaxErrorMock.js
 delete mode 100644 assets/static/__mocks__/ajaxSuccessMock.js

diff --git a/assets/static/__mocks__/ajaxErrorMock.js b/assets/static/__mocks__/ajaxErrorMock.js
deleted file mode 100644
index 5632939f2..000000000
--- a/assets/static/__mocks__/ajaxErrorMock.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const mockXHR = require("mock-xhr");
-
-function ajaxErrorMockServer() {
-    var server = new mockXHR.server();
-    server.handle = function (request) {
-        request.setResponseHeader("Content-Type", "application/json");
-        request.receive(500, JSON.stringify({
-            "status": "error",
-            "errorType": "server_error",
-            "error": "end time must not be modified for elapsed silence"
-        }));
-    };
-    return server;
-}
-
-exports.ajaxErrorMockServer = ajaxErrorMockServer;
diff --git a/assets/static/__mocks__/ajaxSuccessMock.js b/assets/static/__mocks__/ajaxSuccessMock.js
deleted file mode 100644
index 0155f863d..000000000
--- a/assets/static/__mocks__/ajaxSuccessMock.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const mockXHR = require("mock-xhr");
-
-function ajaxSuccessMockServer() {
-    var server = new mockXHR.server();
-    server.handle = function (request) {
-        request.setResponseHeader("Content-Type", "application/json");
-        request.receive(200, JSON.stringify({"status":"success"}));
-    };
-    return server;
-}
-
-exports.ajaxSuccessMockServer = ajaxSuccessMockServer;
diff --git a/assets/static/unsilence.test.js b/assets/static/unsilence.test.js
index 792d27978..7d2bf3027 100644
--- a/assets/static/unsilence.test.js
+++ b/assets/static/unsilence.test.js
@@ -1,5 +1,6 @@
 const $ = window.jQuery = require("jquery");
 const templatesMock = require("./__mocks__/templatesMock");
+const ajaxMock = require("./__mocks__/ajaxMock");
 
 const unsilenceButtonHTML =
     "<button class='silence-delete'" +
@@ -18,8 +19,8 @@ test("unsilence button icons after success", () => {
     require("bootstrap/js/tooltip.js");
     const unsilence = require("./unsilence");
 
-    const ajaxMock = require("./__mocks__/ajaxSuccessMock").ajaxSuccessMockServer();
-    ajaxMock.start();
+    const ajaxServer = ajaxMock.createServer(200, {"status":"success"});
+    ajaxServer.start();
 
     unsilence.init();
     // icon should be trash-o before clicking
@@ -30,7 +31,7 @@ test("unsilence button icons after success", () => {
     expect($("button > span.fa").hasClass("fa-check-circle")).toBe(true);
     expect($("button > span.fa").hasClass("text-success")).toBe(true);
 
-    ajaxMock.stop();
+    ajaxServer.stop();
 });
 
 test("unsilence button icons after failed delete", () => {
@@ -41,8 +42,12 @@ test("unsilence button icons after failed delete", () => {
     require("bootstrap/js/tooltip.js");
     const unsilence = require("./unsilence");
 
-    const ajaxMock = require("./__mocks__/ajaxErrorMock").ajaxErrorMockServer();
-    ajaxMock.start();
+    const ajaxServer = ajaxMock.createServer(500, {
+        "status": "error",
+        "errorType": "server_error",
+        "error": "end time must not be modified for elapsed silence"
+    });
+    ajaxServer.start();
 
     unsilence.init();
     // icon should be trash-o before clicking
@@ -57,5 +62,5 @@ test("unsilence button icons after failed delete", () => {
     jest.runOnlyPendingTimers();
     expect($("button > span.fa").hasClass("fa-trash-o")).toBe(true);
 
-    ajaxMock.stop();
+    ajaxServer.stop();
 });