Add e2e test for checking config method

Author: javierbrea

README.md

@@ -63,7 +63,7 @@ You can change both the base url of the "@mocks-server", and the base api path o
 import { config } from "@mocks-server/cypress-commands";
 
 config({
-  apiPath: "/foo-admin",
+  adminApiPath: "/foo-admin",
   baseUrl: "http://my-mocks-server:3200"
 });
 ```

src/commands.js

@@ -16,9 +16,18 @@ const setSettings = newSettings => {
   return settings.update(newSettings);
 };
 
+// TODO, remove when admin-api-client supports adminApiPath option
+const mapConfig = customConfig => {
+  const configToSet = customConfig;
+  if (customConfig.adminApiPath) {
+    configToSet.apiPath = customConfig.adminApiPath;
+  }
+  return config(configToSet);
+};
+
 module.exports = {
   setBehavior,
   setDelay,
   setSettings,
-  config
+  config: mapConfig
 };

test-e2e/app-data-provider/src/index.js

@@ -6,7 +6,7 @@ let $response;
 let $responseTime;
 
 const response = new Api("/api/response", {
-  baseUrl: "http://localhost:3100"
+  baseUrl: `http://localhost:${process.env.PORT}`
 });
 
 const loadResponse = async function() {

test-e2e/app-data-provider/webpack.config.js

@@ -1,9 +1,15 @@
+const webpack = require("webpack");
 const path = require("path");
 
 module.exports = {
   entry: "./src/index.js",
   output: {
     path: path.resolve(__dirname, "public"),
     filename: "main.js"
-  }
+  },
+  plugins: [
+    new webpack.EnvironmentPlugin({
+      PORT: 3100
+    })
+  ]
 };

test-e2e/cypress.json

@@ -1,4 +1,8 @@
 {
   "baseUrl": "http://localhost:3000",
-  "video": false
+  "video": false,
+  "env": {
+    "MOCKS_ADMIN_API_PATH": "/admin",
+    "MOCKS_URL": "http://localhost:3100"
+  }
 }

test-e2e/cypress/.eslintrc.json

@@ -4,6 +4,7 @@
     "es6": true
   },
   "globals": {
+    "Cypress": true,
     "cy": true,
     "afterEach": true,
     "after": true,

test-e2e/cypress/support/commands.js

@@ -1 +1,6 @@
-import "@mocks-server/cypress-commands";
+import { config } from "@mocks-server/cypress-commands";
+
+config({
+  adminApiPath: Cypress.env("MOCKS_ADMIN_API_PATH"),
+  baseUrl: Cypress.env("MOCKS_URL")
+});

test-e2e/package-lock.json

@@ -5,23 +5,29 @@
   "scripts": {
     "mocks": "mocks-server",
     "mocks:ci": "mocks-server --cli=false",
+    "mocks:ci:custom-config": "mocks-server --cli=false --port=3200 --adminApiPath=/foo",
     "cypress:install": "cypress install",
     "cypress:verify": "cypress verify",
     "cypress:open": "cypress open",
     "cypress:run": "cypress run",
+    "cypress:run:custom-config": "cross-env CYPRESS_MOCKS_URL=http://localhost:3200 CYPRESS_MOCKS_ADMIN_API_PATH=/foo cypress run",
     "start:app-fetch": "cd app-fetch && npm run serve",
     "start:app-data-provider": "cd app-data-provider && npm run build-and-serve",
+    "start:app-data-provider:custom-config": "cd app-data-provider && cross-env PORT=3200 npm run build-and-serve",
     "mocks:ci-and-start:app-fetch": "start-server-and-test mocks:ci http-get://localhost:3100/admin/about start:app-fetch",
     "mocks:ci-and-start:app-data-provider": "start-server-and-test mocks:ci http-get://localhost:3100/admin/about start:app-data-provider",
+    "mocks:ci:custom-config-and-start:app-data-provider:custom-config": "start-server-and-test mocks:ci:custom-config http-get://localhost:3200/foo/about start:app-data-provider:custom-config",
     "test:app-fetch": "start-server-and-test mocks:ci-and-start:app-fetch http-get://localhost:3000 cypress:run",
     "test:app-data-provider": "start-server-and-test mocks:ci-and-start:app-data-provider http-get://localhost:3000 cypress:run",
+    "test:app-data-provider-custom-config": "start-server-and-test mocks:ci:custom-config-and-start:app-data-provider:custom-config http-get://localhost:3000 cypress:run:custom-config",
     "apps:install": "cd app-fetch && npm i && cd ../app-data-provider && npm i",
-    "test:ci": "npm run test:app-fetch && npm run test:app-data-provider"
+    "test:ci": "npm run test:app-fetch && npm run test:app-data-provider && npm run test:app-data-provider-custom-config"
   },
   "devDependencies": {
-    "babel-plugin-module-resolver": "^3.2.0",
     "@mocks-server/main": "^1.6.1",
     "@testing-library/cypress": "^5.0.2",
+    "babel-plugin-module-resolver": "^3.2.0",
+    "cross-env": "^6.0.3",
     "cypress": "3.1.5",
     "start-server-and-test": "^1.10.6"
   }