Skip to content
This repository was archived by the owner on Mar 28, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
9 changes: 5 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 6 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/acceptance/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
};
Expand Down