test: adapt e2e tests. Get coverage from e2e tests. remove unit tests

Author: javierbrea

.gitignore

@@ -9,7 +9,8 @@
 # tests
 /coverage
 /mocks
-/test/e2e/fixtures/files-watch
+/test/e2e/fixtures/temp
+/test/e2e/fixtures/mocks.config.js
 
 # misc
 .DS_Store

jest.config.js

@@ -25,8 +25,8 @@ module.exports = {
   },
 
   // The glob patterns Jest uses to detect test files
-  testMatch: ["<rootDir>/test/unit/**/*.spec.js"],
-  // testMatch: ["<rootDir>/test/unit/**/Plugin.spec.js"],
+  testMatch: ["<rootDir>/test/e2e/**/*.spec.js"],
+  // testMatch: ["<rootDir>/test/e2e/**/legacy-behaviors-api.spec.js"],
 
   // The test environment that will be used for testing
   testEnvironment: "node",

jest.e2e.config.js

@@ -26,9 +26,7 @@
   "scripts": {
     "lint": "eslint *.js src test",
     "lint-staged": "lint-staged",
-    "test": "jest",
-    "test:e2e": "jest --config=jest.e2e.config.js --runInBand",
-    "test:unit": "npm run test"
+    "test:e2e": "jest --runInBand"
   },
   "peerDependencies": {
     "@mocks-server/core": ">=2.0.0"
@@ -40,21 +38,17 @@
   },
   "devDependencies": {
     "@mocks-server/core": "2.0.0-beta.1",
+    "cross-fetch": "3.0.6",
     "eslint": "7.12.1",
     "eslint-plugin-no-only-tests": "2.4.0",
     "eslint-config-prettier": "6.15.0",
     "eslint-plugin-prettier": "3.1.4",
-    "fs-extra": "9.0.1",
     "husky": "4.3.0",
-    "is-promise": "4.0.0",
     "jest": "26.6.3",
     "lint-staged": "10.5.0",
     "prettier": "2.1.2",
-    "request": "2.88.2",
-    "request-promise": "4.2.6",
     "sinon": "9.2.0",
-    "strip-ansi": "6.0.0",
-    "tree-kill-sync": "1.0.0"
+    "wait-on": "5.2.1"
   },
   "lint-staged": {
     "src/**/*.js": "eslint",

package-lock.json

@@ -30,6 +30,7 @@ class AlertsApi {
       getItems: this._getCollection.bind(this),
       parseItem: this._parseModel.bind(this),
       tracer: core.tracer,
+      finder: (context) => (item) => item.context === context,
     });
   }
 

package.json

@@ -91,9 +91,7 @@ class Plugin {
   }
 
   stop() {
-    if (this._stopListeningOnChangeSettings) {
-      this._stopListeningOnChangeSettings();
-    }
+    this._stopListeningOnChangeSettings();
     this._removeRouter();
   }
 

src/Alerts.js

@@ -13,13 +13,14 @@ function collectionMiddleware({ name, getItems, tracer }) {
   };
 }
 
-function modelMiddleware({ name, getItems, parseItem, tracer }) {
+function modelMiddleware({ name, getItems, parseItem, tracer, finder }) {
   const capitalizedName = capitalize(name);
   const returnItem = parseItem ? (item) => parseItem(item) : (item) => item;
+  const finderMethod = finder ? finder : (id) => (item) => item.id === id;
   return function (req, res, next) {
     const id = req.params.id;
     tracer.verbose(`${PLUGIN_NAME}: Sending ${name} ${id} | ${req.id}`);
-    const foundItem = getItems().find((item) => item.id === id);
+    const foundItem = getItems().find(finderMethod(id));
     if (foundItem) {
       res.status(200);
       res.send(returnItem(foundItem));

src/Plugin.js

@@ -8,23 +8,24 @@ http://www.apache.org/licenses/LICENSE-2.0
 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 */
 
-const { startServer, stopServer, request } = require("./support/utils");
+const { startServer, fetch, waitForServer } = require("./support/helpers");
 const { version } = require("../../package.json");
 
 describe("about api", () => {
   let server;
   beforeAll(async () => {
     server = await startServer("web-tutorial");
+    await waitForServer();
   });
 
   afterAll(async () => {
-    await stopServer(server);
+    await server.stop();
   });
 
   describe("get /", () => {
     it("should return current version", async () => {
-      const response = await request("/admin/about");
-      expect(response).toEqual({
+      const response = await fetch("/admin/about");
+      expect(response.body).toEqual({
         version,
       });
     });