Skip to content

Commit

Permalink
Merge pull request #124 from mocks-server/release
Browse files Browse the repository at this point in the history
Release v1.9.0
  • Loading branch information
javierbrea authored Dec 25, 2020
2 parents 3b284b4 + 19450ca commit 8ea5590
Show file tree
Hide file tree
Showing 27 changed files with 240 additions and 142 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-package-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
uses: actions/checkout@v2
- name: Get NPM version is new
id: check
uses: EndBug/version-check@v1.6.0
uses: EndBug/version-check@v2.0.0
with:
diff-search: true
file-name: ./package.json
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
### Removed

## [1.9.0] - 2020-12-25

### Added
- test(E2E): Add more start/stop cli plugin E2E tests
- test(E2E): Add alerts E2E tests

### Changed
- Update dependencies
- Update core version to [1.6.0](https://github.com/mocks-server/core/releases/tag/v1.6.0)
- Update plugin-inquirer-cli version to [1.4.1](https://github.com/mocks-server/plugin-inquirer-cli/releases/tag/v1.4.1)
- Update plugin-admin-api version to [1.5.0](https://github.com/mocks-server/plugin-admin-api/releases/tag/v1.5.0)
- test(E2E): Move support files to support folder

## [1.8.8] - 2020-12-21

### Added
Expand Down
4 changes: 2 additions & 2 deletions jest.e2e.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ module.exports = {
// Automatically clear mock calls and instances between every test
clearMocks: true,

testMatch: ["**/test/e2e/**/?(*.)+(spec|test).js?(x)"],
// testMatch: ["**/test/acceptance/config-file.spec.js"],
testMatch: ["<rootDir>/test/e2e/*.spec.js"],
// testMatch: ["<rootDir>/test/e2e/cli-disabled-runtime.spec.js"],

// Indicates whether the coverage information should be collected while executing the test
collectCoverage: false,
Expand Down
161 changes: 69 additions & 92 deletions package-lock.json

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

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mocks-server/main",
"version": "1.8.8",
"version": "1.9.0",
"description": "Mocks server supporting multiple api behaviors",
"keywords": [
"mocks",
Expand Down Expand Up @@ -39,12 +39,12 @@
"test:unit": "npm run test"
},
"dependencies": {
"@mocks-server/core": "1.5.1",
"@mocks-server/plugin-admin-api": "1.4.6",
"@mocks-server/plugin-inquirer-cli": "1.3.6"
"@mocks-server/core": "1.6.0",
"@mocks-server/plugin-admin-api": "1.5.0",
"@mocks-server/plugin-inquirer-cli": "1.4.1"
},
"devDependencies": {
"eslint": "7.15.0",
"eslint": "7.16.0",
"eslint-config-prettier": "6.15.0",
"eslint-plugin-prettier": "3.3.0",
"fs-extra": "9.0.1",
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-main
sonar.projectVersion=1.8.8
sonar.projectVersion=1.9.0

sonar.javascript.file.suffixes=.js
sonar.sourceEncoding=UTF-8
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/cli-arguments.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Unless required by applicable law or agreed to in writing, software distributed
*/

const path = require("path");
const { CliRunner, request, wait, TimeCounter, BINARY_PATH } = require("./utils");
const { CliRunner, request, wait, TimeCounter, BINARY_PATH } = require("./support/utils");

describe("command line arguments", () => {
const cwdPath = path.resolve(__dirname, "fixtures");
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/cli-disabled-arguments.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Unless required by applicable law or agreed to in writing, software distributed
*/

const path = require("path");
const { CliRunner, request, wait, TimeCounter, BINARY_PATH } = require("./utils");
const { CliRunner, request, wait, TimeCounter, BINARY_PATH } = require("./support/utils");

describe("command line arguments with cli disabled", () => {
const cwdPath = path.resolve(__dirname, "fixtures");
Expand Down
Loading

0 comments on commit 8ea5590

Please sign in to comment.