Merge pull request #77 from mocks-server/release

Release v1.4.7

.github/workflows/build.yml

@@ -0,0 +1,72 @@
+name: build
+on:
+  push:
+    branches:
+      - master
+      - release
+  pull_request:
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: ["12.19.0", "14.15.0", "15.2.0"]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Extract branch name
+        shell: bash
+        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF##*/})"
+        id: extract-branch
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+      - name: Install dependencies
+        run: npm ci
+      - name: Lint
+        run: npm run lint
+      - name: Test unit
+        run: npm run test:unit
+      - name: Test E2E
+        run: npm run test:e2e
+        id: test-e2e
+      - name: Upload test results
+        uses: actions/upload-artifact@v2
+        with:
+          name: coverage-${{ matrix.node }}
+          path: coverage
+          retention-days: 1
+  quality:
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Download test results
+        uses: actions/download-artifact@v2
+        with:
+          name: coverage-15.2.0
+          path: coverage
+      - name: Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: SonarCloud Scan
+        if: env.SONAR_TOKEN != ''
+        uses: sonarsource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/check-package-version.yml

@@ -0,0 +1,44 @@
+name: check-package-version
+on:
+  pull_request:
+    branches:
+      - master
+jobs:
+  check-package-version:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Get NPM version is new
+        id: check
+        uses: EndBug/version-check@v1.6.0
+        with:
+          diff-search: true
+          file-name: ./package.json
+          file-url: https://unpkg.com/@mocks-server/plugin-admin-api@latest/package.json
+          static-checking: localIsNew
+      - name: Check version is new
+        if: steps.check.outputs.changed != 'true'
+        run: |
+          echo "Version not changed"
+          exit 1
+      - name: Get NPM version
+        id: package-version
+        uses: martinbeentjes/npm-get-version-action@v1.1.0
+      - name: Check Changelog version
+        id: changelog_reader
+        uses: mindsers/changelog-reader-action@v2.0.0
+        with:
+          version: ${{ steps.package-version.outputs.current-version }}
+          path: ./CHANGELOG.md
+      - name: Read version from Sonar config
+        id: sonar-version
+        uses: christian-draeger/read-properties@1.0.1
+        with:
+          path: './sonar-project.properties'
+          property: 'sonar.projectVersion'
+      - name: Check Sonar version
+        if: steps.sonar-version.outputs.value != steps.package-version.outputs.current-version
+        run: |
+          echo "Version not changed"
+          exit 1

.github/workflows/publish-to-github.yml

@@ -0,0 +1,18 @@
+name: publish-to-github
+on:
+  release:
+    types: [created]
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v1
+      with:
+        node-version: '12.x'
+        registry-url: 'https://npm.pkg.github.com'
+        # Defaults to the user or organization that owns the workflow file
+        scope: '@mocks-server'
+    - run: npm publish
+      env:
+        NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish-to-npm.yml

@@ -0,0 +1,16 @@
+name: publish-to-npm
+on:
+  release:
+    types: [created]
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v1
+      with:
+        node-version: '12.x'
+        registry-url: 'https://registry.npmjs.org/'
+    - run: npm publish
+      env:
+        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

@@ -9,7 +9,7 @@
 # tests
 /coverage
 /mocks
-/test/acceptance/fixtures/files-watch
+/test/e2e/fixtures/files-watch
 
 # misc
 .DS_Store

CHANGELOG.md

@@ -14,6 +14,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 ### Removed
 
+## [1.4.7] - 2020-12-21
+
+### Added
+- chore(deps): Add support for Node.js v15.x
+
+### Changed
+- chore(ci): Migrate from Travis CI to github actions
+- test(e2e): Rename acceptance tests into e2e tests
+
 ## [1.4.6] - 2020-10-27
 ### Changed
 - chore(deps): Update dependencies

README.md

@@ -1,4 +1,4 @@
-[![Build status][travisci-image]][travisci-url] [![Coverage Status][coveralls-image]][coveralls-url] [![Quality Gate][quality-gate-image]][quality-gate-url]
+[![Build status][build-image]][build-url] [![Coverage Status][coveralls-image]][coveralls-url] [![Quality Gate][quality-gate-image]][quality-gate-url]
 
 [![NPM dependencies][npm-dependencies-image]][npm-dependencies-url] [![Renovate](https://img.shields.io/badge/renovate-enabled-brightgreen.svg)](https://renovatebot.com) [![Last commit][last-commit-image]][last-commit-url] [![Last release][release-image]][release-url] 
 
@@ -51,8 +51,8 @@ Please read the [contributing guidelines](.github/CONTRIBUTING.md) and [code of
 
 [coveralls-image]: https://coveralls.io/repos/github/mocks-server/plugin-admin-api/badge.svg
 [coveralls-url]: https://coveralls.io/github/mocks-server/plugin-admin-api
-[travisci-image]: https://travis-ci.com/mocks-server/plugin-admin-api.svg?branch=master
-[travisci-url]: https://travis-ci.com/mocks-server/plugin-admin-api
+[build-image]: https://github.com/mocks-server/plugin-admin-api/workflows/build/badge.svg?branch=master
+[build-url]: https://github.com/mocks-server/plugin-admin-api/actions?query=workflow%3Abuild+branch%3Amaster
 [last-commit-image]: https://img.shields.io/github/last-commit/mocks-server/plugin-admin-api.svg
 [last-commit-url]: https://github.com/mocks-server/plugin-admin-api/commits
 [license-image]: https://img.shields.io/npm/l/@mocks-server/plugin-admin-api.svg

jest.acceptance.config.js → jest.e2e.config.js

@@ -5,7 +5,7 @@ module.exports = {
   // Automatically clear mock calls and instances between every test
   clearMocks: true,
 
-  testMatch: ["**/test/acceptance/**/?(*.)+(spec|test).js?(x)"],
+  testMatch: ["**/test/e2e/**/?(*.)+(spec|test).js?(x)"],
 
   // Indicates whether the coverage information should be collected while executing the test
   collectCoverage: false,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mocks-server/plugin-admin-api",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "description": "Plugin for Mocks Server. Provides a REST API for administrating settings, fixtures and behaviors",
   "keywords": [
     "mocks-server-plugin",
@@ -27,10 +27,8 @@
     "lint": "eslint *.js src test",
     "lint-staged": "lint-staged",
     "test": "jest",
-    "test:acceptance": "jest --config=jest.acceptance.config.js --runInBand",
-    "test:coverage": "npm run test",
-    "test:ci": "npm run test && npm run test:acceptance",
-    "coveralls": "cat ./coverage/lcov.info | coveralls"
+    "test:e2e": "jest --config=jest.e2e.config.js --runInBand",
+    "test:unit": "npm run test"
   },
   "peerDependencies": {
     "@mocks-server/core": ">=1.3.0"
@@ -42,7 +40,6 @@
   },
   "devDependencies": {
     "@mocks-server/core": "1.5.1",
-    "coveralls": "3.0.9",
     "eslint": "7.12.1",
     "eslint-config-prettier": "6.15.0",
     "eslint-plugin-prettier": "3.1.4",
@@ -69,6 +66,6 @@
     }
   },
   "engines": {
-    "node": "12.x || 14.x"
+    "node": "12.x || 14.x || 15.x"
   }
 }

sonar-project.properties

@@ -1,6 +1,6 @@
 sonar.organization=mocks-server
 sonar.projectKey=mocks-server-plugin-admin-api
-sonar.projectVersion=1.4.6
+sonar.projectVersion=1.4.7
 
 sonar.javascript.file.suffixes=.js
 sonar.sourceEncoding=UTF-8