Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: karma-runner/karma
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.7.1
Choose a base ref
...
head repository: karma-runner/karma
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.0.1
Choose a head ref
Loading
Showing with 8,203 additions and 1,276 deletions.
  1. +0 −4 .babelrc
  2. +1 −0 .mailmap
  3. +5 −7 .travis.yml
  4. +100 −1 CHANGELOG.md
  5. +1 −1 README.md
  6. +1 −4 appveyor.yml
  7. +32 −5 client/karma.js
  8. +2 −0 common/stringify.js
  9. +1 −1 config.tpl.coffee
  10. +1 −1 config.tpl.js
  11. +1 −1 config.tpl.ls
  12. +1 −1 config.tpl.ts
  13. +7 −3 docs/config/01-configuration-file.md
  14. +11 −0 docs/config/02-files.md
  15. +1 −0 docs/dev/02-making-changes.md
  16. +1 −1 docs/intro/01-installation.md
  17. +1 −1 docs/intro/04-faq.md
  18. +3 −4 gruntfile.js
  19. +142 −119 lib/browser.js
  20. +43 −46 lib/browser_collection.js
  21. +13 −9 lib/browser_result.js
  22. +31 −25 lib/cli.js
  23. +22 −20 lib/completion.js
  24. +140 −123 lib/config.js
  25. +5 −3 lib/constants.js
  26. +8 −6 lib/detached.js
  27. +28 −21 lib/emitter_wrapper.js
  28. +12 −12 lib/file-list.js
  29. +3 −1 lib/file.js
  30. +0 −8 lib/helper.js
  31. +1 −0 lib/launcher.js
  32. +45 −16 lib/logger.js
  33. +1 −1 lib/middleware/common.js
  34. +29 −6 lib/middleware/karma.js
  35. +5 −6 lib/middleware/source_files.js
  36. +14 −4 lib/preprocessor.js
  37. +2 −1 lib/reporter.js
  38. +61 −17 lib/server.js
  39. +2 −1 lib/url.js
  40. +94 −72 package.json
  41. +8 −2 scripts/validate-commit-msg.sh
  42. +2 −2 static/debug.js
  43. +5 −0 test/client/stringify.spec.js
  44. +264 −0 test/e2e/step_definitions/core_steps.js
  45. +5 −3 test/e2e/{support/after_hooks.js → step_definitions/hooks.js}
  46. +0 −227 test/e2e/steps/core_steps.js
  47. +4 −4 test/e2e/support/env.js
  48. +2 −2 test/e2e/support/tag/tag.js
  49. +2 −2 test/e2e/support/tag/test-with-version.js
  50. +6 −1 test/e2e/support/world.js
  51. +1 −1 test/e2e/tag.feature
  52. +47 −45 test/unit/browser.spec.js
  53. +37 −35 test/unit/browser_collection.spec.js
  54. +7 −5 test/unit/browser_result.spec.js
  55. +50 −34 test/unit/cli.spec.js
  56. +6 −4 test/unit/completion.spec.js
  57. +81 −80 test/unit/config.spec.js
  58. +9 −7 test/unit/emitter_wrapper.spec.js
  59. +1 −1 test/unit/events.spec.js
  60. +259 −83 test/unit/file-list.spec.js
  61. +1 −1 test/unit/helper.spec.js
  62. +2 −1 test/unit/init.spec.js
  63. +4 −2 test/unit/init/formatters.spec.js
  64. +1 −1 test/unit/init/state_machine.spec.js
  65. +41 −44 test/unit/launcher.spec.js
  66. +3 −3 test/unit/launchers/base.spec.js
  67. +3 −3 test/unit/launchers/capture_timeout.spec.js
  68. +9 −9 test/unit/launchers/process.spec.js
  69. +4 −4 test/unit/launchers/retry.spec.js
  70. +30 −6 test/unit/logger.spec.js
  71. +37 −16 test/unit/middleware/karma.spec.js
  72. +1 −1 test/unit/middleware/proxy.spec.js
  73. +18 −16 test/unit/middleware/runner.spec.js
  74. +14 −20 test/unit/middleware/source_files.spec.js
  75. +1 −1 test/unit/middleware/strip_host.spec.js
  76. +1 −1 test/unit/mocks/timer.js
  77. +80 −21 test/unit/preprocessor.spec.js
  78. +28 −6 test/unit/reporter.spec.js
  79. +1 −1 test/unit/reporters/base.spec.js
  80. +16 −15 test/unit/runner.spec.js
  81. +16 −3 test/unit/server.spec.js
  82. +2 −2 test/unit/watcher.spec.js
  83. +8 −9 test/unit/web-server.spec.js
  84. +6,215 −0 yarn.lock
4 changes: 0 additions & 4 deletions .babelrc

This file was deleted.

1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<bitwiseman@gmail.com> <lnewman@book.com>
<vojta.jina@gmail.com> <vojta@google.com>
<friedel.ziegelmayer@gmail.com> <dignifiedquire@gmail.com>
Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
sudo: false
language: node_js
node_js:
- "0.10"
- "0.12"
- 4
- 5
- 7
- 6
- 8
- 9

env:
global:
@@ -16,13 +14,13 @@ env:
matrix:
fast_finish: true
include:
- node_js: "6"
- node_js: "8"
env: VALIDATE_COMMIT_MSG=true LINT=true

before_install:
- npm config set loglevel warn
- g++-4.8 --version
- npm install -g npm
- if [[ "`node --version`" = v4* ]]; then npm install -g npm@latest-3; fi

addons:
firefox:
@@ -38,7 +36,7 @@ before_script:
- sh -e /etc/init.d/xvfb start
- npm run init
- export $(openssl aes-256-cbc -pass env:CREDENTIALS_PASS -d -in credentials)
- 'if [ "$VALIDATE_COMMIT_MSG" == "true" ]; then npm run travis; else ./scripts/validate-commit-msg.sh $TRAVIS_COMMIT; fi'
- 'if [ "$VALIDATE_COMMIT_MSG" == "true" ]; then ./scripts/validate-commit-msg.sh $TRAVIS_COMMIT; fi'
- 'if [ "$LINT" == "true" ]; then npm run lint; fi'

script:
101 changes: 100 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,102 @@
<a name="2.0.1"></a>
## [2.0.1](https://github.com/karma-runner/karma/compare/v1.7.1...v2.0.1) (2018-04-19)


### Bug Fixes

* **browser:** nicer "disconnect" - no more "Disconnectedundefined" ([a987d63](https://github.com/karma-runner/karma/commit/a987d63))
* **common:** fix AppVeyor build ([6c5e7d0](https://github.com/karma-runner/karma/commit/6c5e7d0))
* **common:** more detailed info about error ([424aacc](https://github.com/karma-runner/karma/commit/424aacc))
* **config:** Call debug log methods after setting the loglevel based upon config/cli-options. ([a340dae](https://github.com/karma-runner/karma/commit/a340dae))
* **config:** Call debug log methods after setting the loglevel based upon config/cli-options. ([99fd3f0](https://github.com/karma-runner/karma/commit/99fd3f0))
* **config:** Retry install with appveyor-retry. ([17d5791](https://github.com/karma-runner/karma/commit/17d5791))
* **config:** Workaround npm 5.4 windows bug ([ec47d81](https://github.com/karma-runner/karma/commit/ec47d81))
* **deps:** update socket.io to version 2.0.3. ([3b7b019](https://github.com/karma-runner/karma/commit/3b7b019)), closes [#2777](https://github.com/karma-runner/karma/issues/2777)
* **logging:** Upgrade to log4js 2.x API. ([#2868](https://github.com/karma-runner/karma/issues/2868)) ([f6f8707](https://github.com/karma-runner/karma/commit/f6f8707)), closes [#2858](https://github.com/karma-runner/karma/issues/2858)
* **middleware:** add file type to absolute urls ([bd1f799](https://github.com/karma-runner/karma/commit/bd1f799))
* ignore jsVersion configuration property in Firefox 59+ ([2694d54](https://github.com/karma-runner/karma/commit/2694d54)), closes [#2957](https://github.com/karma-runner/karma/issues/2957)
* **middleware:** avoid using deprecated Buffer API ([018e6be](https://github.com/karma-runner/karma/commit/018e6be))
* **reporter:** Fix issue causing error stack not to be parsed correctly ([ac4e1a9](https://github.com/karma-runner/karma/commit/ac4e1a9)), closes [#2930](https://github.com/karma-runner/karma/issues/2930)
* **reporter:** show file path correctly when urlRoot specified ([34dc7d3](https://github.com/karma-runner/karma/commit/34dc7d3)), closes [#2897](https://github.com/karma-runner/karma/issues/2897)
* **server:** switch to sync write ([6ec74ee](https://github.com/karma-runner/karma/commit/6ec74ee))


### Features

* **cli:** Warn on commands with underscores. ([0801a7f](https://github.com/karma-runner/karma/commit/0801a7f))
* **config:** allow to use newer versions of CoffeeScript ([c1fcf42](https://github.com/karma-runner/karma/commit/c1fcf42))
* **launcher:** trim whitespace in browser name ([871d46f](https://github.com/karma-runner/karma/commit/871d46f))
* **launcher:** trim whitespace in browser name ([334f9fb](https://github.com/karma-runner/karma/commit/334f9fb))
* **middleware:** added manual file type option ([0330cd1](https://github.com/karma-runner/karma/commit/0330cd1)), closes [#2824](https://github.com/karma-runner/karma/issues/2824)
* better string representation of errors ([c9e1ca9](https://github.com/karma-runner/karma/commit/c9e1ca9))
* drop core-js and babel where possible ([60dfc5c](https://github.com/karma-runner/karma/commit/60dfc5c))
* update of supported node versions ([e79463b](https://github.com/karma-runner/karma/commit/e79463b))



<a name="1.7.1"></a>
## [1.7.1](https://github.com/karma-runner/karma/compare/v1.7.0...1.7.1) (2017-08-25)


### Bug Fixes

* **debug-runner:** support asynchronous tests in the debug runner ([a36f3eb](https://github.com/karma-runner/karma/commit/a36f3eb)), closes [#2811](https://github.com/karma-runner/karma/issues/2811)
* **file-list:** Stop polluting global environment with core-js ([0988022](https://github.com/karma-runner/karma/commit/0988022))
* **preprocessor:** renamed handeFile to readFileCallback ([92a8c81](https://github.com/karma-runner/karma/commit/92a8c81))
* **preprocessor:** retry if fs.readFile fails ([4b60513](https://github.com/karma-runner/karma/commit/4b60513))
* **preprocessor:** throw if retry fails ([2789bf5](https://github.com/karma-runner/karma/commit/2789bf5))


### Features

* **ci:** disable testing of node versions below 4 ([ec92ea9](https://github.com/karma-runner/karma/commit/ec92ea9))
* **client:** log global error stack trace ([523d608](https://github.com/karma-runner/karma/commit/523d608)), closes [#2812](https://github.com/karma-runner/karma/issues/2812)
* **config:** remove polling usage ([b0f41c7](https://github.com/karma-runner/karma/commit/b0f41c7)), closes [#2669](https://github.com/karma-runner/karma/issues/2669)
* **deps:** add support for node[@8](https://github.com/8) ([7feaee3](https://github.com/karma-runner/karma/commit/7feaee3)), closes [#2754](https://github.com/karma-runner/karma/issues/2754)
* **deps:** update socket.io to `1.7.4` to avoid issue with `ws[@1](https://github.com/1).1.2` ([264442b](https://github.com/karma-runner/karma/commit/264442b)), closes [#2593](https://github.com/karma-runner/karma/issues/2593)
* **watcher:** Debounce autoWatchBatchDelay ([2f8c049](https://github.com/karma-runner/karma/commit/2f8c049)), closes [#2331](https://github.com/karma-runner/karma/issues/2331)



<a name="2.0.0"></a>
# [2.0.0](https://github.com/karma-runner/karma/compare/v1.7.1...v2.0.0) (2017-12-21)


### Bug Fixes

* **config:** Call debug log methods after setting the loglevel based upon config/cli-options. ([99fd3f0](https://github.com/karma-runner/karma/commit/99fd3f0))
* **config:** Call debug log methods after setting the loglevel based upon config/cli-options. ([a340dae](https://github.com/karma-runner/karma/commit/a340dae))
* **config:** Retry install with appveyor-retry. ([17d5791](https://github.com/karma-runner/karma/commit/17d5791))
* **config:** Workaround npm 5.4 windows bug ([ec47d81](https://github.com/karma-runner/karma/commit/ec47d81))
* **deps:** update socket.io to version 2.0.3. ([3b7b019](https://github.com/karma-runner/karma/commit/3b7b019)), closes [#2821](https://github.com/karma-runner/karma/issues/2821) [#2777](https://github.com/karma-runner/karma/issues/2777)
* **logging:** Upgrade to log4js 2.x API. ([#2868](https://github.com/karma-runner/karma/issues/2868)) ([f6f8707](https://github.com/karma-runner/karma/commit/f6f8707)), closes [#2858](https://github.com/karma-runner/karma/issues/2858)
* **reporter:** show file path correctly when urlRoot specified ([34dc7d3](https://github.com/karma-runner/karma/commit/34dc7d3)), closes [#2897](https://github.com/karma-runner/karma/issues/2897)
* **debug-runner:** support asynchronous tests in the debug runner ([a36f3eb](https://github.com/karma-runner/karma/commit/a36f3eb)), closes [#2811](https://github.com/karma-runner/karma/issues/2811)
* **file-list:** Stop polluting global environment with core-js ([0988022](https://github.com/karma-runner/karma/commit/0988022))
* **preprocessor:** renamed handeFile to readFileCallback ([92a8c81](https://github.com/karma-runner/karma/commit/92a8c81))
* **preprocessor:** retry if fs.readFile fails ([4b60513](https://github.com/karma-runner/karma/commit/4b60513))
* **preprocessor:** throw if retry fails ([2789bf5](https://github.com/karma-runner/karma/commit/2789bf5))


### Features

* **cli:** Warn on commands with underscores. ([0801a7f](https://github.com/karma-runner/karma/commit/0801a7f))
* **config:** allow to use newer versions of CoffeeScript ([c1fcf42](https://github.com/karma-runner/karma/commit/c1fcf42))
* **launcher:** trim whitespace in browser name ([871d46f](https://github.com/karma-runner/karma/commit/871d46f))
* **launcher:** trim whitespace in browser name ([334f9fb](https://github.com/karma-runner/karma/commit/334f9fb))
* **middleware:** added manual file type option ([0330cd1](https://github.com/karma-runner/karma/commit/0330cd1)), closes [#2824](https://github.com/karma-runner/karma/issues/2824)
* better string representation of errors ([c9e1ca9](https://github.com/karma-runner/karma/commit/c9e1ca9))
n* drop core-js and babel where possible ([60dfc5c](https://github.com/karma-runner/karma/commit/60dfc5c))
* update of supported node versions ([e79463b](https://github.com/karma-runner/karma/commit/e79463b))
* **ci:** disable testing of node versions below 4 ([ec92ea9](https://github.com/karma-runner/karma/commit/ec92ea9))
* **client:** log global error stack trace ([523d608](https://github.com/karma-runner/karma/commit/523d608)), closes [#2812](https://github.com/karma-runner/karma/issues/2812)
* **config:** remove polling usage ([b0f41c7](https://github.com/karma-runner/karma/commit/b0f41c7)), closes [#2669](https://github.com/karma-runner/karma/issues/2669)
* **deps:** add support for node@8 ([7feaee3](https://github.com/karma-runner/karma/commit/7feaee3)), closes [#2754](https://github.com/karma-runner/karma/issues/2754)
* **deps:** update socket.io to `1.7.4` to avoid issue with `ws@1.1.2` ([264442b](https://github.com/karma-runner/karma/commit/264442b)), closes [#2593](https://github.com/karma-runner/karma/issues/2593)
* **watcher:** Debounce autoWatchBatchDelay ([2f8c049](https://github.com/karma-runner/karma/commit/2f8c049)), closes [#2331](https://github.com/karma-runner/karma/issues/2331)



<a name="1.7.1"></a>
## [1.7.1](https://github.com/karma-runner/karma/compare/v1.7.0...v1.7.1) (2017-08-30)

@@ -581,7 +680,7 @@ to match this new format.
var server = new Server(config, done)
server.start()
```

Closes #1037, #1482, #1467
([82cbbadd](https://github.com/karma-runner/karma/commit/82cbbadd))

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Karma
[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/karma-runner/karma) [![npm version](https://img.shields.io/npm/v/karma.svg?style=flat-square)](https://www.npmjs.com/package/karma) [![npm downloads](https://img.shields.io/npm/dm/karma.svg?style=flat-square)](https://www.npmjs.com/package/karma)
[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/karma-runner/karma) [![npm version](https://img.shields.io/npm/v/karma.svg?style=flat-square)](https://www.npmjs.com/package/karma) [![npm downloads](https://img.shields.io/npm/dm/karma.svg?style=flat-square)](https://npmcharts.com/compare/karma?minimal=true)

[![Build Status](https://img.shields.io/travis/karma-runner/karma/master.svg?style=flat-square)](https://travis-ci.org/karma-runner/karma) [![Build Status](https://img.shields.io/appveyor/ci/dignifiedquire/karma/master.svg?style=flat-square)](https://ci.appveyor.com/project/dignifiedquire/karma) [![Code Climate](https://img.shields.io/codeclimate/github/karma-runner/karma.svg?style=flat-square)](https://codeclimate.com/github/karma-runner/karma) [![PRs Welcome](https://img.shields.io/badge/prs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Dependency Status](https://img.shields.io/david/karma-runner/karma.svg?style=flat-square)](https://david-dm.org/karma-runner/karma) [![devDependency Status](https://img.shields.io/david/dev/karma-runner/karma.svg?style=flat-square)](https://david-dm.org/karma-runner/karma#info=devDependencies)

5 changes: 1 addition & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -2,11 +2,8 @@ version: "{build}"

environment:
matrix:
- nodejs_version: "0.12"
- nodejs_version: "4"
- nodejs_version: "5"
- nodejs_version: "6"
- nodejs_version: "7"
- nodejs_version: "8"

matrix:
@@ -24,7 +21,7 @@ install:
- npm --version

# Install our package dependencies
- npm install
- appveyor-retry npm install

# Install our current directory as a dependency of itself
- npm run init:windows
37 changes: 32 additions & 5 deletions client/karma.js
Original file line number Diff line number Diff line change
@@ -104,15 +104,42 @@ var Karma = function (socket, iframe, opener, navigator, location) {
navigateContextTo('about:blank')
}

function getLocation (url, lineno, colno) {
var location = ''

if (url !== undefined) {
location += url
}

if (lineno !== undefined) {
location += ':' + lineno
}

if (colno !== undefined) {
location += ':' + colno
}

return location
}

// error during js file loading (most likely syntax error)
// we are not going to execute at all
this.error = function (msg, url, line) {
var message = msg
// we are not going to execute at all. `window.onerror` callback.
this.error = function (messageOrEvent, source, lineno, colno, error) {
var message = messageOrEvent
var location = getLocation(source, lineno, colno)

if (url) {
message = msg + '\nat ' + url + (line ? ':' + line : '')
if (location !== '') {
message += '\nat ' + location
}

if (error) {
message += '\n\n' + error.stack
}

// create an object with the string representation of the message to ensure all its content is properly
// transferred to the console log
message = {message: message, str: message.toString()}

socket.emit('karma_error', message)
this.complete()
return false
2 changes: 2 additions & 0 deletions common/stringify.js
Original file line number Diff line number Diff line change
@@ -54,6 +54,8 @@ var stringify = function stringify (obj, depth) {
return obj.outerHTML
} else if (isNode(obj)) {
return serialize(obj)
} else if (instanceOf(obj, 'Error')) {
return obj.toString() + '\n' + obj.stack
} else {
var constructor = 'Object'
if (obj.constructor && typeof obj.constructor === 'function') {
2 changes: 1 addition & 1 deletion config.tpl.coffee
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ module.exports = (config) ->
]


# list of files to exclude
# list of files / patterns to exclude
exclude: [%EXCLUDE%
]

2 changes: 1 addition & 1 deletion config.tpl.js
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ module.exports = function(config) {
],


// list of files to exclude
// list of files / patterns to exclude
exclude: [%EXCLUDE%
],

2 changes: 1 addition & 1 deletion config.tpl.ls
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ module.exports = (config) ->
]


# list of files to exclude
# list of files / patterns to exclude
exclude: [%EXCLUDE%
]

2 changes: 1 addition & 1 deletion config.tpl.ts
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ module.exports = (config) => {
],


// list of files to exclude
// list of files / patterns to exclude
exclude: [%EXCLUDE%
],

10 changes: 7 additions & 3 deletions docs/config/01-configuration-file.md
Original file line number Diff line number Diff line change
@@ -89,8 +89,9 @@ These are all of the available configuration options.

**Description:** When Karma is watching the files for changes, it tries to batch
multiple changes into a single run so that the test runner doesn't try to start and restart running
tests more than it should. The configuration setting tells Karma how long to wait (in milliseconds) after any changes
have occurred before starting the test process again.
tests more than it should, or restart while build files are not in a consistent state. The configuration setting
tells Karma how long to wait (in milliseconds) from the last file change before starting
the test process again, resetting the timer each time a file changes (i.e. [debouncing](https://davidwalsh.name/javascript-debounce-function)).


## basePath
@@ -173,6 +174,7 @@ If, during test execution, Karma does not receive any message from a browser wit

* `Chrome` (launcher requires karma-chrome-launcher plugin)
* `ChromeCanary` (launcher requires karma-chrome-launcher plugin)
* `ChromeHeadless` (launcher requires karma-chrome-launcher plugin ^2.1.0)
* `PhantomJS` (launcher requires karma-phantomjs-launcher plugin)
* `Firefox` (launcher requires karma-firefox-launcher plugin)
* `Opera` (launcher requires karma-opera-launcher plugin)
@@ -521,6 +523,8 @@ See [plugins] for more information.

**Description:** The port where the web server will be listening.

If the defined port is already in use, karma will automatically increase its value in steps of 1 until a free port is found.


## processKillTimeout
**Type:** Number
@@ -799,7 +803,7 @@ sometimes you might want to proxy a url that is already taken by Karma.

If `> 0`, Karma will add a JavaScript version tag to the included JavaScript files.

Note: This will only be applied to the Firefox browser. It is currently the only browser that supports the version tag.
Note: This will only be applied to the Firefox browser up to version 58. Support for JavaScript version was [removed](https://bugzilla.mozilla.org/show_bug.cgi?id=1428745) in Firefox 59. This property is deprecated and will be removed in the next major release of Karma.


[plugins]: plugins.html
11 changes: 11 additions & 0 deletions docs/config/02-files.md
Original file line number Diff line number Diff line change
@@ -24,6 +24,17 @@ Each pattern is either a simple string or an object with four properties:
* **No Default.**
* **Description.** The pattern to use for matching. This property is mandatory.

### `type`
* **Type.** String
* **Default.** Will attempt to determine type based on file extension. If that fails, defaults to `js`.
* **Description.** Choose the type to use when including a file.
* **Possible Values:**
* `css`
* `html`
* `js`
* `dart`
* `module`

### `watched`
* **Type.** Boolean
* **Default.** `true`
1 change: 1 addition & 0 deletions docs/dev/02-making-changes.md
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ TODO:

If you are thinking about making Karma better, or you just want to hack on it, that’s great!
Here are some tips on how to set up a Karma workspace and how to send a good pull request.
**Please note we enforce [commit message conventions].**

## Setting up the Workspace

2 changes: 1 addition & 1 deletion docs/intro/01-installation.md
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ Karma runs on [Node.js] and is available as an [NPM] package.
On Mac or Linux we recommend using [NVM](https://github.com/creationix/nvm). On Windows, download Node.js
from [the official site](https://nodejs.org/) or use the [NVM PowerShell Module](https://www.powershellgallery.com/packages/nvm).

Note: Karma currently works on Node.js **0.10**, **0.12.x**, **4.x**, **5.x**, **6.x**, **7.x**, and **8.x**. See [FAQ] for more info.
Note: Karma currently works on Node.js **4.x**, **5.x**, **6.x**, **7.x**, and **8.x**. See [FAQ] for more info.

## Installing Karma and plugins

2 changes: 1 addition & 1 deletion docs/intro/04-faq.md
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ The latest stable version from NPM (`npm install karma`). See [versioning] for m


### Which version of Node.js does Karma run with?
Karma works on all LTS versions node in active maintenance state (see [LTS docs](https://github.com/nodejs/LTS/blob/master/README.md) for more info) as well as the latest stable version. That is **0.12.x**, **4.x**, **5.x** and **6.x** at this point. Additionally, Node **0.10** is currently supported.
Karma works on all LTS versions node in active maintenance state (see [LTS docs](https://github.com/nodejs/LTS/blob/master/README.md) for more info) as well as the latest stable version. That is **4.x**, **5.x**, **6.x**, and **8.x** at this point.


[mailing list]: https://groups.google.com/d/forum/karma-users
Loading