Skip to content
This repository was archived by the owner on Mar 28, 2022. It is now read-only.

Commit cc8deeb

Browse files
authored
Merge pull request #5 from mocks-server/v1.1.0
V1.1.0
2 parents 52b942a + f5a7b2e commit cc8deeb

File tree

6 files changed

+18
-16
lines changed

6 files changed

+18
-16
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ addons:
1717

1818
script:
1919
- npm run lint
20-
- npm run test-ci
20+
- npm run test:ci
2121
- npm run coveralls
2222
- 'if [ -n "$SONAR_TOKEN" ]; then sonar-scanner -Dsonar.login=${SONAR_TOKEN}; fi'
2323

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1313
### Fixed
1414
### Removed
1515

16+
## [1.1.0] - 2019-12-07
17+
### Changed
18+
- Upgrade "@mocks-server" core dependency. Use new "path" option.
19+
1620
## [1.0.0] - 2019-12-06
1721
- 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)
1822
- Export Plugin, which can be used only programmatically. (Binary is still distributed in the [@mocks-server/main](https://github.com/mocks-server/main) package).

package-lock.json

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
{
22
"name": "@mocks-server/plugin-admin-api",
3-
"version": "1.0.0",
3+
"version": "1.1.0",
44
"description": "Plugin for Mocks Server. Provides a REST API for administrating settings, fixtures and behaviors",
55
"keywords": [
6-
"mocks",
7-
"server",
8-
"mock",
9-
"plugin",
6+
"mocks-server-plugin",
107
"administration",
118
"admin",
129
"api",
@@ -30,18 +27,18 @@
3027
"lint": "eslint index.js src test jest.config.js jest.acceptance.config.js",
3128
"lint-staged": "lint-staged",
3229
"test": "jest",
33-
"test-acceptance": "jest --config=jest.acceptance.config.js --runInBand",
34-
"test-ci": "npm run test && npm run test-acceptance",
30+
"test:acceptance": "jest --config=jest.acceptance.config.js --runInBand",
31+
"test:ci": "npm run test && npm run test:acceptance",
3532
"coveralls": "cat ./coverage/lcov.info | coveralls"
3633
},
3734
"peerDependencies": {
38-
"@mocks-server/core": "1.0.0"
35+
"@mocks-server/core": "^1.1.0"
3936
},
4037
"dependencies": {
4138
"express": "4.17.1"
4239
},
4340
"devDependencies": {
44-
"@mocks-server/core": "1.0.0",
41+
"@mocks-server/core": "^1.1.0",
4542
"coveralls": "^3.0.7",
4643
"eslint": "6.6.0",
4744
"eslint-config-prettier": "6.5.0",

sonar-project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
sonar.organization=mocks-server
22
sonar.projectKey=mocks-server-plugin-admin-api
3-
sonar.projectVersion=1.0.0
3+
sonar.projectVersion=1.1.0
44

55
sonar.javascript.file.suffixes=.js
66
sonar.sourceEncoding=UTF-8

test/acceptance/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const fixturesFolder = folderName => {
3535
const startServer = (mocksPath, opts = {}) => {
3636
const mocks = mocksPath || "web-tutorial";
3737
const options = {
38-
behaviors: fixturesFolder(mocks),
38+
path: fixturesFolder(mocks),
3939
...defaultOptions,
4040
...opts
4141
};

0 commit comments

Comments
 (0)