Skip to content

Commit

Permalink
Merge pull request #5 from mocks-server/v1.0.3
Browse files Browse the repository at this point in the history
V1.0.3
  • Loading branch information
javierbrea authored Nov 8, 2019
2 parents e4d159b + 9279a5a commit 7ecc012
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 27 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
### Removed

## [1.0.3] - 2019-11-08
### Fixed
- Fix examples and badges in readme.

## [1.0.2] - 2019-11-08
### Changed
- Project forked from xbyorange/mocks-server. Fixed license. Read NOTICE for further details
Expand Down
6 changes: 3 additions & 3 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
mocks-server. Main distribution
mocks-server. Main distributable
Copyright 2019 Javier Brea

Portions of this software were developed at XbyOrange company.
XByOrange npm-file-link v1.0.1, distributed under The Apache Software License, Version 2.0.
Github repository "xbyorange/mocks-server" (https://github.com/XbyOrange/mocks-server), branch master, commit 961ca6702569091ed863679a8e675788c6f4fded. The original project files were wrongly licensed because an error of the main maintainer, Javier Brea, who received instructions from the XbyOrange company about licensing it as Apache2.0, but didn't include the appropiate license header in all repository files by error. The error has been fixed and license headers has been added to all original files, as it was the real intention of the XbyOrange company.
XByOrange mocks-server v1.0.1, distributed under The Apache Software License, Version 2.0.
Github repository "xbyorange/mocks-server" (https://github.com/XbyOrange/mocks-server), branch master, commit 961ca6702569091ed863679a8e675788c6f4fded. The original project files were wrongly licensed because an error of the main maintainer, Javier Brea, who received instructions from the XbyOrange company about licensing it as Apache2.0, but didn't include the appropiate license header in all repository files by error. The error has been fixed and XbyOrange license headers have been added to all original files, as it was the real intention of the XbyOrange company.
42 changes: 21 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ It also provide a built-in CLI and a REST API which allows to change the current
## Installation

```bash
npm i @xbyorange/mocks-server --save-dev
npm i @mocks-server/main --save-dev
```

## Usage
Expand Down Expand Up @@ -76,7 +76,7 @@ Available api resources are:
The interactive CLI can be instantiated and started programmatically:

```js
const { Cli } = require("@xbyorange/mocks-server");
const { Cli } = require("@mocks-server/main");

const startMyCli = () => {
const cli = new Cli({
Expand Down Expand Up @@ -107,7 +107,7 @@ When server watch is active, the main menu will be displayed on file changes. Th
The server can be instantiated and started programmatically:

```js
const { Server } = require("@xbyorange/mocks-server");
const { Server } = require("@mocks-server/main");

const startMyServer = () => {
const server = new Server(path.resolve(__dirname, "mocks"), {
Expand Down Expand Up @@ -148,7 +148,7 @@ Available getters are:
The mocks server can be used as a global dependency as well:

```bash
npm i @xbyorange/mocks-server -g
npm i @mocks-server/main -g
```

Now, you can start the built-in command line interface from anywhere, providing a path to a features folder:
Expand Down Expand Up @@ -184,7 +184,7 @@ For creating a Feature, you have to use the mocks-server "Feature" class, provid
```js
// Features file 1

const { Feature } = require("@xbyorange/mocks-server");
const { Feature } = require("@mocks-server/main");

const fixtures = require("./fixtures");

Expand Down Expand Up @@ -271,19 +271,19 @@ module.exports = {
Contributors are welcome.
Please read the [contributing guidelines](.github/CONTRIBUTING.md) and [code of conduct](.github/CODE_OF_CONDUCT.md).

[coveralls-image]: https://coveralls.io/repos/github/XbyOrange/mocks-server/badge.svg
[coveralls-url]: https://coveralls.io/github/XbyOrange/mocks-server
[travisci-image]: https://travis-ci.com/xbyorange/mocks-server.svg?branch=master
[travisci-url]: https://travis-ci.com/xbyorange/mocks-server
[last-commit-image]: https://img.shields.io/github/last-commit/xbyorange/mocks-server.svg
[last-commit-url]: https://github.com/xbyorange/mocks-server/commits
[license-image]: https://img.shields.io/npm/l/@xbyorange/mocks-server.svg
[license-url]: https://github.com/xbyorange/mocks-server/blob/master/LICENSE
[npm-downloads-image]: https://img.shields.io/npm/dm/@xbyorange/mocks-server.svg
[npm-downloads-url]: https://www.npmjs.com/package/@xbyorange/mocks-server
[npm-dependencies-image]: https://img.shields.io/david/xbyorange/mocks-server.svg
[npm-dependencies-url]: https://david-dm.org/xbyorange/mocks-server
[quality-gate-image]: https://sonarcloud.io/api/project_badges/measure?project=xbyorange-mocks-server&metric=alert_status
[quality-gate-url]: https://sonarcloud.io/dashboard?id=xbyorange-mocks-server
[release-image]: https://img.shields.io/github/release-date/xbyorange/mocks-server.svg
[release-url]: https://github.com/xbyorange/mocks-server/releases
[coveralls-image]: https://coveralls.io/repos/github/mocks-server/main/badge.svg
[coveralls-url]: https://coveralls.io/github/mocks-server/main
[travisci-image]: https://travis-ci.com/mocks-server/main.svg?branch=master
[travisci-url]: https://travis-ci.com/mocks-server/main
[last-commit-image]: https://img.shields.io/github/last-commit/mocks-server/main.svg
[last-commit-url]: https://github.com/mocks-server/main/commits
[license-image]: https://img.shields.io/npm/l/@mocks-server/main.svg
[license-url]: https://github.com/mocks-server/main/blob/master/LICENSE
[npm-downloads-image]: https://img.shields.io/npm/dm/@mocks-server/main.svg
[npm-downloads-url]: https://www.npmjs.com/package/@mocks-server/main
[npm-dependencies-image]: https://img.shields.io/david/mocks-server/main.svg
[npm-dependencies-url]: https://david-dm.org/mocks-server/main
[quality-gate-image]: https://sonarcloud.io/api/project_badges/measure?project=mocks-server-main&metric=alert_status
[quality-gate-url]: https://sonarcloud.io/dashboard?id=mocks-server-main
[release-image]: https://img.shields.io/github/release-date/mocks-server/main.svg
[release-url]: https://github.com/mocks-server/main/releases
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mocks-server/main",
"version": "1.0.2",
"version": "1.0.3",
"description": "Mocks server with extensible fixtures groupables in predefined behaviors. Behavior can be changed using CLI or REST API",
"keywords": [
"mocks",
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.0.2
sonar.projectVersion=1.0.3

sonar.javascript.file.suffixes=.js
sonar.sourceEncoding=UTF-8
Expand Down

0 comments on commit 7ecc012

Please sign in to comment.