Skip to content

Commit 8b4bc53

Browse files
XhmikosRXhmikosR
authored
Merge branch 'master' into master
2 parents cbf66a1 + 963269d commit 8b4bc53

20 files changed

+15232
-5921
lines changed

‎.eslintrc‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
{
2-
"extends": "standard"
2+
"root": true,
3+
"extends": "standard",
4+
"rules": {
5+
"no-var": "off"
6+
}
37
}

‎.github/workflows/lint.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Lint
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- master
7+
8+
jobs:
9+
lint:
10+
name: Lint
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v3
14+
with:
15+
fetch-depth: 0
16+
- uses: actions/setup-node@v3
17+
with:
18+
node-version: 16
19+
cache: npm
20+
- run: npm ci
21+
- run: npm run lint
22+
- run: |
23+
npm run commitlint -- \
24+
--verbose \
25+
--from `git merge-base origin/master $GITHUB_SHA`

‎.github/workflows/release.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
main:
10+
name: Test and Release
11+
runs-on: ubuntu-latest
12+
env:
13+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
14+
GITHUB_TOKEN: ${{ secrets.KARMARUNNERBOT_GITHUB_TOKEN }}
15+
steps:
16+
- uses: actions/checkout@v3
17+
with:
18+
token: ${{ env.GITHUB_TOKEN }}
19+
fetch-depth: 0
20+
- uses: browser-actions/setup-firefox@latest
21+
- uses: actions/setup-node@v3
22+
with:
23+
node-version: 16
24+
cache: npm
25+
- run: npm ci
26+
- run: |
27+
npm run commitlint -- \
28+
--verbose \
29+
--from `git merge-base origin/master $GITHUB_SHA`
30+
- run: npm run build
31+
- run: npm run test:unit
32+
- run: npm run test:e2e
33+
- run: npm run test:integration
34+
- run: npm run release

‎.github/workflows/test.yml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: Test
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- master
7+
8+
jobs:
9+
linux:
10+
name: "Node ${{ matrix.node }} on Linux: Test"
11+
runs-on: ubuntu-latest
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
node:
16+
- 12
17+
- 14
18+
- 16
19+
steps:
20+
- uses: actions/checkout@v3
21+
with:
22+
fetch-depth: 0
23+
- uses: browser-actions/setup-firefox@latest
24+
- uses: actions/setup-node@v3
25+
with:
26+
node-version: ${{ matrix.node }}
27+
cache: npm
28+
- run: npm ci
29+
- run: npm run build
30+
- run: npm run test:unit
31+
- run: npm run test:e2e
32+
- run: npm run test:integration
33+
windows:
34+
name: "Node ${{ matrix.node }} on Windows: Test"
35+
runs-on: windows-latest
36+
defaults:
37+
run:
38+
shell: bash
39+
strategy:
40+
fail-fast: false
41+
matrix:
42+
node:
43+
- 12
44+
- 14
45+
- 16
46+
steps:
47+
- uses: actions/checkout@v3
48+
- uses: actions/setup-node@v3
49+
with:
50+
node-version: ${{ matrix.node }}
51+
cache: npm
52+
- run: npm ci
53+
- run: npm run build
54+
- run: npm run test:unit
55+
- run: npm run test:e2e
56+
- run: npm run test:integration

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ node_modules/
33
tmp/
44
lib/adapter.js
55
integration-tests/
6+
.DS_Store
7+
/karma-jasmine-*.tgz

‎.travis.yml‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,36 @@
1+
# [5.0.0](https://github.com/karma-runner/karma-jasmine/compare/v4.0.2...v5.0.0) (2022-04-12)
2+
3+
4+
### Bug Fixes
5+
6+
* limit karma peer dependency to ^6.0.0 ([d72c124](https://github.com/karma-runner/karma-jasmine/commit/d72c124d9f30402acb31ecdf77fd517208713320))
7+
8+
9+
### Build System
10+
11+
* drop Node.js 10 support ([ea691e8](https://github.com/karma-runner/karma-jasmine/commit/ea691e82cffe14358bfaddfc1f42f0ba58145e32))
12+
13+
14+
### Features
15+
16+
* **deps:** update dependencies including jasmine-core ([821f094](https://github.com/karma-runner/karma-jasmine/commit/821f094801dcd8380c2dee15c0f1686e9df5dca7))
17+
18+
19+
### BREAKING CHANGES
20+
21+
* The minimum required version of karma is 6.0.0.
22+
* The minimum required version of Node is 12.0.0.
23+
* **deps:** jasmine-core was updated to the 4.1.0.
24+
25+
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.
26+
27+
## [4.0.2](https://github.com/karma-runner/karma-jasmine/compare/v4.0.1...v4.0.2) (2022-03-30)
28+
29+
30+
### Bug Fixes
31+
32+
* sync package-lock.json and package.json ([4dacc5d](https://github.com/karma-runner/karma-jasmine/commit/4dacc5d4cae68d73337cefad5a5879a6471fe42c))
33+
134
## [4.0.1](https://github.com/karma-runner/karma-jasmine/compare/v4.0.0...v4.0.1) (2020-08-12)
235

336

‎README.md‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# karma-jasmine
22

3-
[![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)
4-
5-
[![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)
6-
7-
[![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)
3+
[![npm version](https://img.shields.io/npm/v/karma-jasmine?style=flat-square)](https://www.npmjs.com/package/karma-jasmine)
4+
[![npm downloads](https://img.shields.io/npm/dm/karma-jasmine?style=flat-square)](https://www.npmjs.com/package/karma-jasmine)
5+
[![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)
6+
[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen?style=flat-square)](https://github.com/karma-runner/karma-jasmine)
7+
[![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)
88

99
> Adapter for the [Jasmine](https://jasmine.github.io/) testing framework.
1010
@@ -21,7 +21,6 @@ npm install karma-jasmine --save-dev
2121
module.exports = function(config) {
2222
config.set({
2323
frameworks: ['jasmine'],
24-
2524
files: [
2625
'*.js'
2726
]
@@ -41,10 +40,10 @@ or
4140
```js
4241
module.exports = function(config) {
4342
config.set({
44-
...
43+
// ...
4544
client: {
4645
args: ['--grep', '<pattern>'],
47-
...
46+
// ...
4847
}
4948
})
5049
}
@@ -82,4 +81,4 @@ integration across shards.
8281

8382
---
8483

85-
For more information on Karma see the [homepage](https://karma-runner.github.com/).
84+
For more information on Karma see the [homepage](https://karma-runner.github.io/).

‎commitlint.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = {extends: ['@commitlint/config-conventional']}
1+
module.exports = { extends: ['@commitlint/config-angular'] }

‎gruntfile.js‎

Lines changed: 1 addition & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,10 @@
1+
// Do not add new tasks. Grunt is used only for building and will be replaced.
12
module.exports = function (grunt) {
23
grunt.loadTasks('tasks')
34
grunt.initConfig({
45
pkgFile: 'package.json',
56
build: {
67
adapter: ['src/adapter.js']
7-
},
8-
'npm-contributors': {
9-
options: {
10-
commitMessage: 'chore: update contributors'
11-
}
12-
},
13-
conventionalChangelog: {
14-
release: {
15-
options: {
16-
changelogOpts: {
17-
preset: 'angular'
18-
}
19-
},
20-
src: 'CHANGELOG.md'
21-
}
22-
},
23-
conventionalGithubReleaser: {
24-
release: {
25-
options: {
26-
auth: {
27-
type: 'oauth',
28-
token: process.env.GH_TOKEN
29-
},
30-
changelogOpts: {
31-
preset: 'angular'
32-
}
33-
}
34-
}
35-
},
36-
bump: {
37-
options: {
38-
commitMessage: 'chore: release v%VERSION%',
39-
pushTo: 'upstream',
40-
commitFiles: [
41-
'package.json',
42-
'CHANGELOG.md'
43-
]
44-
}
45-
},
46-
karma: {
47-
adapter: {
48-
configFile: 'karma.conf.js',
49-
autoWatch: false,
50-
singleRun: true,
51-
reporters: ['dots']
52-
}
53-
},
54-
eslint: {
55-
target: [
56-
'src/adapter.js',
57-
'lib/boot.js',
58-
'lib/index.js',
59-
'gruntfile.js',
60-
'karma.conf.js',
61-
'test/*.js',
62-
'tasks/*.js'
63-
]
648
}
659
})
66-
67-
require('load-grunt-tasks')(grunt)
68-
69-
grunt.registerTask('test', ['build', 'karma'])
70-
grunt.registerTask('default', ['eslint', 'test'])
71-
72-
grunt.registerTask('release', 'Bump the version and publish to NPM.', function (type) {
73-
grunt.task.run([
74-
'build',
75-
'npm-contributors',
76-
'bump:' + (type || 'patch') + ':bump-only',
77-
'conventionalChangelog',
78-
'bump-commit',
79-
'conventionalGithubReleaser',
80-
'npm-publish'
81-
])
82-
})
8310
}

0 commit comments

Comments
 (0)