diff --git a/.travis.yml b/.travis.yml index 6633dfd..c516fe6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ addons: script: - npm run lint - - npm run test-ci + - npm run test:ci - npm run coveralls - 'if [ -n "$SONAR_TOKEN" ]; then sonar-scanner -Dsonar.login=${SONAR_TOKEN}; fi' diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f762c6..f50343a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Fixed ### Removed +## [1.1.0] - 2019-12-07 +### Changed +- Upgrade "@mocks-server" core dependency. Use new "path" option. + ## [1.0.0] - 2019-12-06 - Migrate administration api from [@mocks-server/main, v1.3.0](https://github.com/mocks-server/main/releases/tag/v1.3.0). For further info read the [previous repository CHANGELOG.md](https://github.com/mocks-server/main/blob/v1.3.0/CHANGELOG.md#130---2019-11-17) - Export Plugin, which can be used only programmatically. (Binary is still distributed in the [@mocks-server/main](https://github.com/mocks-server/main) package). diff --git a/package-lock.json b/package-lock.json index 6dd9ba4..d8a87ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@mocks-server/plugin-admin-api", - "version": "1.0.0", + "version": "1.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -465,9 +465,9 @@ } }, "@mocks-server/core": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@mocks-server/core/-/core-1.0.0.tgz", - "integrity": "sha512-Up3gDTUBCyC81H+tivxwoJorVaxEmVeQFe4PdaqajydyfxZEfZI3hBtjEgj2JjiqjZSQTkILrbIdo2CkVe7T1g==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@mocks-server/core/-/core-1.1.0.tgz", + "integrity": "sha512-uucdenxR1nIlmP8s+Rjh71pwkDxLSXb6Haadq1SZjFVRk3JDuxVj0jbxRXJdzqoiGW/WOSuV7hpysZcrHkqJKw==", "dev": true, "requires": { "body-parser": "1.19.0", @@ -476,6 +476,7 @@ "cors": "2.8.5", "express": "4.17.1", "express-request-id": "1.4.1", + "fs-extra": "^8.1.0", "lodash": "4.17.15", "node-watch": "0.6.3", "require-all": "3.0.0", diff --git a/package.json b/package.json index 4f42438..10f9851 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,9 @@ { "name": "@mocks-server/plugin-admin-api", - "version": "1.0.0", + "version": "1.1.0", "description": "Plugin for Mocks Server. Provides a REST API for administrating settings, fixtures and behaviors", "keywords": [ - "mocks", - "server", - "mock", - "plugin", + "mocks-server-plugin", "administration", "admin", "api", @@ -30,18 +27,18 @@ "lint": "eslint index.js src test jest.config.js jest.acceptance.config.js", "lint-staged": "lint-staged", "test": "jest", - "test-acceptance": "jest --config=jest.acceptance.config.js --runInBand", - "test-ci": "npm run test && npm run test-acceptance", + "test:acceptance": "jest --config=jest.acceptance.config.js --runInBand", + "test:ci": "npm run test && npm run test:acceptance", "coveralls": "cat ./coverage/lcov.info | coveralls" }, "peerDependencies": { - "@mocks-server/core": "1.0.0" + "@mocks-server/core": "^1.1.0" }, "dependencies": { "express": "4.17.1" }, "devDependencies": { - "@mocks-server/core": "1.0.0", + "@mocks-server/core": "^1.1.0", "coveralls": "^3.0.7", "eslint": "6.6.0", "eslint-config-prettier": "6.5.0", diff --git a/sonar-project.properties b/sonar-project.properties index aeacfbc..40c3037 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,6 +1,6 @@ sonar.organization=mocks-server sonar.projectKey=mocks-server-plugin-admin-api -sonar.projectVersion=1.0.0 +sonar.projectVersion=1.1.0 sonar.javascript.file.suffixes=.js sonar.sourceEncoding=UTF-8 diff --git a/test/acceptance/utils.js b/test/acceptance/utils.js index 7b66800..786e00b 100644 --- a/test/acceptance/utils.js +++ b/test/acceptance/utils.js @@ -35,7 +35,7 @@ const fixturesFolder = folderName => { const startServer = (mocksPath, opts = {}) => { const mocks = mocksPath || "web-tutorial"; const options = { - behaviors: fixturesFolder(mocks), + path: fixturesFolder(mocks), ...defaultOptions, ...opts };