Skip to content

Commit

Permalink
Merge branch 'master' into feat/v3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Ronald Holshausen committed Sep 23, 2020
2 parents 02f09b4 + d7a39c5 commit 0d32437
Show file tree
Hide file tree
Showing 28 changed files with 4,099 additions and 3,597 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/trigger_pact_docs_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@ on:
- '**.md'

jobs:
run:
build:
runs-on: ubuntu-latest
steps:
- name: Trigger docs.pact.io update workflow
run: |
curl -X POST https://api.github.com/repos/pact-foundation/docs.pact.io/dispatches \
-H 'Accept: application/vnd.github.everest-preview+json' \
-H "Authorization: Bearer $GITHUB_TOKEN" \
-d '{"event_type": "pact-js-docs-updated"}'
env:
GITHUB_TOKEN: ${{ secrets.GHTOKENFORTRIGGERINGPACTDOCSUPDATE }}
uses: peter-evans/repository-dispatch@v1
with:
token: ${{ secrets.GHTOKENFORTRIGGERINGPACTDOCSUPDATE }}
repository: pact-foundation/docs.pact.io
event-type: pact-js-docs-updated
18 changes: 18 additions & 0 deletions .mocharc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"bail": true,
"require": [
"ts-node/register",
"./test/helper.ts",
"source-map-support/register"
],
"fullTrace": true,
"reporter": "spec",
"colors": true,
"recursive": true,
"timeout": 30000,
"spec": [
"src/*.spec.ts",
"src/**/*.spec.ts"
],
"exit": true
}
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- <<: *test
node_js: "14"

- stage: 🚀 publish to npm 🚀
- stage: deploy
node_js: "12"
if: tag IS present
deploy:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ All notable changes to this project will be documented in this file. See [standa
* release node 14 native binaries ([9ee832c](https://github.com/pact-foundation/pact-js/commit/9ee832c8dcfd896432ef34fb57595496bcac0077))

## [10.0.0-beta.5](https://github.com/pact-foundation/pact-js/compare/v9.11.0...v10.0.0-beta.5) (2020-05-27)
## [9.12.0](https://github.com/pact-foundation/pact-js/compare/v9.11.1...v9.12.0) (2020-09-21)


### Features
Expand All @@ -62,6 +63,7 @@ All notable changes to this project will be documented in this file. See [standa
* support regex matcher with a regexp object ([d92f6f5](https://github.com/pact-foundation/pact-js/commit/d92f6f5eee92667e5a3ce0ecdd44177d18a6b7ff))
* support text nodes configured from XML builder ([a2a7f55](https://github.com/pact-foundation/pact-js/commit/a2a7f55eff4a187cbe30a3e56917745ebc40e33d))
* support using matchers on XML text nodes ([b3b5e62](https://github.com/pact-foundation/pact-js/commit/b3b5e6231e9f0ade7be045ff117b441d0169114a))
* allow also WebDAV HTTP Requests ([2ac811d](https://github.com/pact-foundation/pact-js/commit/2ac811d514a6a419a0e2d1abec1ac46e854d4770))


### Bug Fixes
Expand Down Expand Up @@ -150,6 +152,8 @@ All notable changes to this project will be documented in this file. See [standa
* add some tests around the conusmer DSL matchers ([e6a153f](https://github.com/pact-foundation/pact-js/commit/e6a153fd62d48644b97018d69e5f23d1710e510f))
* handle XML matching with different types of child elements ([2143ca4](https://github.com/pact-foundation/pact-js/commit/2143ca4c968969e1c6218dd8e538097733ccfa56))
* implemented consumer DSL URL matcher ([f27a444](https://github.com/pact-foundation/pact-js/commit/f27a44409aed3ece1adbab6af9e853b7684c101c))
* package.json & package-lock.json to reduce vulnerabilities ([0bb8512](https://github.com/pact-foundation/pact-js/commit/0bb851255c0f08d25fd935e5bd164ce99063a9ae))
* **pact-node:** Bump version of pact-node to pick up improved logging options ([1e09e1e](https://github.com/pact-foundation/pact-js/commit/1e09e1e44017811966defd9ba87c24066385d059))

### [9.11.1](https://github.com/pact-foundation/pact-js/compare/v9.11.0...v9.11.1) (2020-07-18)

Expand Down
18 changes: 15 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,22 @@ label in our issue tracker. If you have an idea that you think would be great, c
## Commit messages

Pact JS uses the [Conventional Changelog](https://github.com/bcoe/conventional-changelog-standard/blob/master/convention.md)
commit message conventions. Please ensure you follow the guidelines, we don't want to _be that person_, but the commit messages
are very important to the automation of our release process.
commit message conventions. Please ensure you follow the guidelines, as they
help us automate our release process.

Take a look at the git history (`git log`) to get the gist of it.
Should your change include something that should be listed in the release
notes, please use `feat` or `fix` commits with a good commit message. Your
commit message will automatically be included in the release notes.

If you are committing something that shouldn't be listed in the release
notes, please use a different type (even if it is technically a fix). We
usually use one of `chore`, `style`, `refactor`, or `test` as appropriate.

You can take a look at the git history (`git log`) to get the gist of it.
If you have questions, feel free to reach out in `#pact-js` in our [slack
community](https://pact-foundation.slack.com/).

If you'd like to get some CLI assistance, getting setup is easy:

If you'd like to get some CLI assistance, getting setup is easy:

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Read [Getting started with Pact] for more information for beginners.

<p align="center">
<a href="https://asciinema.org/a/105793">
<img width="880" src="https://raw.githubusercontent.com/pact-foundation/pact-js/master/.github/pact.svg?sanitize=true&t=1">
<img width="880" src="https://raw.githubusercontent.com/pact-foundation/pact-js/master/.github/pact.svg?sanitize=true&t=1"></img>
</a>
</p>

Expand Down Expand Up @@ -1351,9 +1351,9 @@ Try starting the mock service manually and seeing if it comes up. When submittin
## Contact
Join us in [Slack](slack.pact.io)
Join us on [Slack](https://slack.pact.io)
<a href="https://slack.pact.io"><img src="https://slack.pact.io/badge.svg"></a>
<a href="https://slack.pact.io"><img src="https://slack.pact.io/badge.svg"></img></a>
or chat to us at
Expand Down
Loading

0 comments on commit 0d32437

Please sign in to comment.