Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR committed Apr 19, 2022
2 parents cbf66a1 + 963269d commit 8b4bc53
Show file tree
Hide file tree
Showing 20 changed files with 15,232 additions and 5,921 deletions.
6 changes: 5 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
{
"extends": "standard"
"root": true,
"extends": "standard",
"rules": {
"no-var": "off"
}
}
25 changes: 25 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Lint

on:
pull_request:
branches:
- master

jobs:
lint:
name: Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-node@v3
with:
node-version: 16
cache: npm
- run: npm ci
- run: npm run lint
- run: |
npm run commitlint -- \
--verbose \
--from `git merge-base origin/master $GITHUB_SHA`
34 changes: 34 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Release

on:
push:
branches:
- master

jobs:
main:
name: Test and Release
runs-on: ubuntu-latest
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
GITHUB_TOKEN: ${{ secrets.KARMARUNNERBOT_GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v3
with:
token: ${{ env.GITHUB_TOKEN }}
fetch-depth: 0
- uses: browser-actions/setup-firefox@latest
- uses: actions/setup-node@v3
with:
node-version: 16
cache: npm
- run: npm ci
- run: |
npm run commitlint -- \
--verbose \
--from `git merge-base origin/master $GITHUB_SHA`
- run: npm run build
- run: npm run test:unit
- run: npm run test:e2e
- run: npm run test:integration
- run: npm run release
56 changes: 56 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Test

on:
pull_request:
branches:
- master

jobs:
linux:
name: "Node ${{ matrix.node }} on Linux: Test"
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
node:
- 12
- 14
- 16
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: browser-actions/setup-firefox@latest
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: npm
- run: npm ci
- run: npm run build
- run: npm run test:unit
- run: npm run test:e2e
- run: npm run test:integration
windows:
name: "Node ${{ matrix.node }} on Windows: Test"
runs-on: windows-latest
defaults:
run:
shell: bash
strategy:
fail-fast: false
matrix:
node:
- 12
- 14
- 16
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: npm
- run: npm ci
- run: npm run build
- run: npm run test:unit
- run: npm run test:e2e
- run: npm run test:integration
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ node_modules/
tmp/
lib/adapter.js
integration-tests/
.DS_Store
/karma-jasmine-*.tgz
24 changes: 0 additions & 24 deletions .travis.yml

This file was deleted.

33 changes: 33 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,36 @@
# [5.0.0](https://github.com/karma-runner/karma-jasmine/compare/v4.0.2...v5.0.0) (2022-04-12)


### Bug Fixes

* limit karma peer dependency to ^6.0.0 ([d72c124](https://github.com/karma-runner/karma-jasmine/commit/d72c124d9f30402acb31ecdf77fd517208713320))


### Build System

* drop Node.js 10 support ([ea691e8](https://github.com/karma-runner/karma-jasmine/commit/ea691e82cffe14358bfaddfc1f42f0ba58145e32))


### Features

* **deps:** update dependencies including jasmine-core ([821f094](https://github.com/karma-runner/karma-jasmine/commit/821f094801dcd8380c2dee15c0f1686e9df5dca7))


### BREAKING CHANGES

* The minimum required version of karma is 6.0.0.
* The minimum required version of Node is 12.0.0.
* **deps:** jasmine-core was updated to the 4.1.0.

Please refer to the [release notes](https://github.com/jasmine/jasmine/blob/main/release_notes/4.0.0.md) for the complete list of changes and migration instructions.

## [4.0.2](https://github.com/karma-runner/karma-jasmine/compare/v4.0.1...v4.0.2) (2022-03-30)


### Bug Fixes

* sync package-lock.json and package.json ([4dacc5d](https://github.com/karma-runner/karma-jasmine/commit/4dacc5d4cae68d73337cefad5a5879a6471fe42c))

## [4.0.1](https://github.com/karma-runner/karma-jasmine/compare/v4.0.0...v4.0.1) (2020-08-12)


Expand Down
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# karma-jasmine

[![npm version](https://img.shields.io/npm/v/karma-jasmine.svg?style=flat-square)](https://www.npmjs.com/package/karma-jasmine) [![npm downloads](https://img.shields.io/npm/dm/karma-jasmine.svg?style=flat-square)](https://www.npmjs.com/package/karma-jasmine)

[![Build Status](https://img.shields.io/travis/karma-runner/karma-jasmine/master.svg?style=flat-square)](https://travis-ci.org/karma-runner/karma-jasmine) [![Dependency Status](https://img.shields.io/david/karma-runner/karma-jasmine.svg?style=flat-square)](https://david-dm.org/karma-runner/karma-jasmine) [![devDependency Status](https://img.shields.io/david/dev/karma-runner/karma-jasmine.svg?style=flat-square)](https://david-dm.org/karma-runner/karma-jasmine?type=dev)

[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/karma-runner/karma-jasmine) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
[![npm version](https://img.shields.io/npm/v/karma-jasmine?style=flat-square)](https://www.npmjs.com/package/karma-jasmine)
[![npm downloads](https://img.shields.io/npm/dm/karma-jasmine?style=flat-square)](https://www.npmjs.com/package/karma-jasmine)
[![Release Workflow Status](https://img.shields.io/github/workflow/status/karma-runner/karma-jasmine/Release/master?style=flat-square&logo=github&label=Release)](https://github.com/karma-runner/karma-jasmine/actions/workflows/release.yml?query=branch%3Amaster)
[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen?style=flat-square)](https://github.com/karma-runner/karma-jasmine)
[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079?style=flat-square)](https://github.com/semantic-release/semantic-release)

> Adapter for the [Jasmine](https://jasmine.github.io/) testing framework.
Expand All @@ -21,7 +21,6 @@ npm install karma-jasmine --save-dev
module.exports = function(config) {
config.set({
frameworks: ['jasmine'],

files: [
'*.js'
]
Expand All @@ -41,10 +40,10 @@ or
```js
module.exports = function(config) {
config.set({
...
// ...
client: {
args: ['--grep', '<pattern>'],
...
// ...
}
})
}
Expand Down Expand Up @@ -82,4 +81,4 @@ integration across shards.

---

For more information on Karma see the [homepage](https://karma-runner.github.com/).
For more information on Karma see the [homepage](https://karma-runner.github.io/).
2 changes: 1 addition & 1 deletion commitlint.config.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = {extends: ['@commitlint/config-conventional']}
module.exports = { extends: ['@commitlint/config-angular'] }
75 changes: 1 addition & 74 deletions gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,83 +1,10 @@
// Do not add new tasks. Grunt is used only for building and will be replaced.
module.exports = function (grunt) {
grunt.loadTasks('tasks')
grunt.initConfig({
pkgFile: 'package.json',
build: {
adapter: ['src/adapter.js']
},
'npm-contributors': {
options: {
commitMessage: 'chore: update contributors'
}
},
conventionalChangelog: {
release: {
options: {
changelogOpts: {
preset: 'angular'
}
},
src: 'CHANGELOG.md'
}
},
conventionalGithubReleaser: {
release: {
options: {
auth: {
type: 'oauth',
token: process.env.GH_TOKEN
},
changelogOpts: {
preset: 'angular'
}
}
}
},
bump: {
options: {
commitMessage: 'chore: release v%VERSION%',
pushTo: 'upstream',
commitFiles: [
'package.json',
'CHANGELOG.md'
]
}
},
karma: {
adapter: {
configFile: 'karma.conf.js',
autoWatch: false,
singleRun: true,
reporters: ['dots']
}
},
eslint: {
target: [
'src/adapter.js',
'lib/boot.js',
'lib/index.js',
'gruntfile.js',
'karma.conf.js',
'test/*.js',
'tasks/*.js'
]
}
})

require('load-grunt-tasks')(grunt)

grunt.registerTask('test', ['build', 'karma'])
grunt.registerTask('default', ['eslint', 'test'])

grunt.registerTask('release', 'Bump the version and publish to NPM.', function (type) {
grunt.task.run([
'build',
'npm-contributors',
'bump:' + (type || 'patch') + ':bump-only',
'conventionalChangelog',
'bump-commit',
'conventionalGithubReleaser',
'npm-publish'
])
})
}
7 changes: 3 additions & 4 deletions karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
module.exports = function (config) {
config.set({
frameworks: ['jasmine'],
reporters: ['karma-jasmine'],
reporters: ['karma-jasmine', 'dots'],

files: [
'src/*.js',
'test/*.js'
],

browsers: process.env.TRAVIS ? ['Firefox'] : ['Chrome'],
browsers: ['FirefoxHeadless'],

autoWatch: true,
singleRun: true,

plugins: [
'karma-firefox-launcher',
'karma-chrome-launcher',
require.resolve('./')
]
})
Expand Down

0 comments on commit 8b4bc53

Please sign in to comment.