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

Commit

Permalink
Merge pull request #158 from mocks-server/release
Browse files Browse the repository at this point in the history
Release v2.2.0
  • Loading branch information
javierbrea committed Apr 14, 2021
2 parents ea1daed + 508f6b5 commit f8c2a27
Show file tree
Hide file tree
Showing 50 changed files with 3,331 additions and 244 deletions.
10 changes: 9 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,13 @@
"no-only-tests/no-only-tests": [2]
},
"extends": ["prettier"],
"root": true
"root": true,
"overrides": [
{
"files": ["jest.setup.js"],
"parserOptions": {
"sourceType": "module"
}
}
]
}
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ["12.19.0", "14.15.0", "15.2.0"]
node: ["12.22.1", "14.16.1", "15.14.0"]
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
- name: Download test results
uses: actions/download-artifact@v2
with:
name: coverage-15.2.0
name: coverage-15.14.0
path: coverage
- name: Coveralls
uses: coverallsapp/github-action@master
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
/coverage
/mocks
/mocks-legacy
/mocks-ts
/test/e2e/v1/fixtures/files-watch
/test/e2e/v2/fixtures/temp
/test/e2e/v2/fixtures/mocks
Expand All @@ -18,6 +19,8 @@
/mocks.config.js
/test/e2e/v1/fixtures/mocks.config.js
/test/e2e/v2/fixtures/mocks.config.js
/babel.config.js
/_babel.config.js

# misc
.DS_Store
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Removed
### BREAKING CHANGES

## [2.2.0] - 2021-04-14

### Added
- feat: Add `babelRegister` and `babelRegisterOptions` low level configuration options, allowing to enable Babel when loading mocks and routes (#151);
- feat: Add `lowLevelConfig` getter to core, returning low level configuration properties.

### Changed
- chore: update node versions in pipeline
- chore(deps): update dependencies

## [2.1.0] - 2021-03-23

### Added
Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module.exports = {

// The glob patterns Jest uses to detect test files
testMatch: ["<rootDir>/test/unit/**/*.spec.js"],
// testMatch: ["<rootDir>/test/unit/**/Config.spec.js"],
// testMatch: ["<rootDir>/test/unit/**/files-loader/helpers.spec.js"],

// The test environment that will be used for testing
testEnvironment: "node",
Expand Down
2 changes: 1 addition & 1 deletion jest.e2e.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
clearMocks: true,

testMatch: ["<rootDir>/test/e2e/**/*.spec.js"],
// testMatch: ["<rootDir>/test/e2e/**/watch-enabled.spec.js"],
// testMatch: ["<rootDir>/test/e2e/**/typescript.spec.js"],

// Indicates whether the coverage information should be collected while executing the test
collectCoverage: false,
Expand Down
3 changes: 2 additions & 1 deletion jest.e2e.setup.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* global jest */
// import "regenerator-runtime/runtime";

jest.setTimeout(10000);
jest.setTimeout(20000);
Loading

0 comments on commit f8c2a27

Please sign in to comment.