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: v3.1.4
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: v6.4.3
Choose a head ref
Loading
Showing with 26,897 additions and 11,148 deletions.
  1. +1 −1 .eslintignore
  2. 0 .eslintrc → .eslintrc.json
  3. +10 −0 .github/ISSUE_TEMPLATE/bug_report.md
  4. +25 −0 .github/workflows/lint.yml
  5. +35 −0 .github/workflows/release.yml
  6. +59 −0 .github/workflows/test.yml
  7. +1 −4 .gitignore
  8. +1 −0 .npmignore
  9. +0 −46 .travis.yml
  10. +709 −156 CHANGELOG.md
  11. +1 −1 CODE_OF_CONDUCT.md
  12. +2 −2 CONTRIBUTING.md
  13. +1 −1 LICENSE
  14. +0 −3 PULL_REQUEST_TEMPLATE.md
  15. +19 −5 README.md
  16. +11 −0 SECURITY.md
  17. +0 −29 appveyor.yml
  18. +119 −53 client/karma.js
  19. +7 −7 client/main.js
  20. +57 −16 client/updater.js
  21. +1 −0 commitlint.config.js
  22. +12 −2 common/stringify.js
  23. +1 −1 common/util.js
  24. +5 −5 config.tpl.coffee
  25. +5 −5 config.tpl.js
  26. +5 −5 config.tpl.ls
  27. +5 −5 config.tpl.ts
  28. +9 −7 context/karma.js
  29. +2 −2 context/main.js
  30. BIN credentials
  31. +13 −0 cucumber.js
  32. +1 −1 docs/about/01-versioning.md
  33. +5 −4 docs/about/03-migration.md
  34. +75 −20 docs/config/01-configuration-file.md
  35. +53 −30 docs/config/02-files.md
  36. +3 −3 docs/config/03-browsers.md
  37. +5 −4 docs/config/04-preprocessors.md
  38. +31 −21 docs/config/05-plugins.md
  39. +3 −1 docs/dev/01-contributing.md
  40. +21 −22 docs/dev/02-making-changes.md
  41. +4 −4 docs/dev/03-maintaining.md
  42. +273 −31 docs/dev/04-public-api.md
  43. +142 −44 docs/dev/05-plugins.md
  44. +22 −23 docs/dev/06-git-commit-msg.md
  45. +2 −0 docs/index.md
  46. +4 −4 docs/intro/01-installation.md
  47. +2 −2 docs/intro/02-configuration.md
  48. +1 −1 docs/intro/03-how-it-works.md
  49. +4 −3 docs/intro/04-faq.md
  50. +22 −5 docs/intro/05-troubleshooting.md
  51. +3 −1 docs/plus/01-requirejs.md
  52. +17 −5 docs/plus/02-travis.md
  53. +5 −3 docs/plus/03-jenkins.md
  54. +2 −0 docs/plus/04-semaphore.md
  55. +3 −3 docs/plus/06-angularjs.md
  56. +1 −1 docs/plus/07-yeoman.md
  57. +77 −75 docs/plus/08-emberjs.md
  58. +1 −1 docs/plus/09-codio.md
  59. +3 −1 docs/plus/10-teamcity.md
  60. +0 −155 gruntfile.js
  61. +42 −32 lib/browser.js
  62. +17 −10 lib/browser_collection.js
  63. +124 −104 lib/cli.js
  64. +2 −2 lib/completion.js
  65. +166 −49 lib/config.js
  66. +2 −2 lib/constants.js
  67. +1 −1 lib/events.js
  68. +33 −0 lib/executor.js
  69. +76 −100 lib/file-list.js
  70. +16 −1 lib/file.js
  71. +16 −28 lib/helper.js
  72. +1 −14 lib/index.js
  73. +2 −2 lib/init.js
  74. +55 −40 lib/launcher.js
  75. +17 −8 lib/launchers/base.js
  76. +1 −1 lib/launchers/capture_timeout.js
  77. +11 −6 lib/launchers/process.js
  78. +7 −7 lib/logger.js
  79. +0 −26 lib/middleware/common.js
  80. +50 −44 lib/middleware/karma.js
  81. +28 −14 lib/middleware/proxy.js
  82. +37 −29 lib/middleware/runner.js
  83. +1 −1 lib/middleware/source_files.js
  84. +50 −5 lib/plugin.js
  85. +86 −105 lib/preprocessor.js
  86. +16 −4 lib/reporter.js
  87. +12 −12 lib/reporters/base_color.js
  88. +42 −11 lib/runner.js
  89. +191 −122 lib/server.js
  90. +35 −5 lib/stopper.js
  91. +14 −1 lib/url.js
  92. +0 −27 lib/utils/bundle-utils.js
  93. +11 −0 lib/utils/dns-utils.js
  94. +0 −10 lib/utils/json-utils.js
  95. +0 −1 lib/utils/net-utils.js
  96. +14 −0 lib/utils/pattern-utils.js
  97. +23 −26 lib/watcher.js
  98. +19 −30 lib/web-server.js
  99. +14,848 −0 package-lock.json
  100. +280 −253 package.json
  101. +45 −0 release.config.js
  102. +77 −0 scripts/client.js
  103. +1 −1 scripts/karma-completion.sh
  104. +0 −38 scripts/validate-commit-msg.sh
  105. +2 −2 static/client.html
  106. +1 −1 static/client_with_context.html
  107. +2,645 −0 static/context.js
  108. +1 −1 static/debug.html
  109. +2,904 −0 static/karma.js
  110. +0 −18 tasks/init-dev-env.js
  111. +0 −48 tasks/test.js
  112. +1 −2 test/.eslintrc
  113. +30 −54 test/client/karma.conf.js
  114. +164 −64 test/client/karma.spec.js
  115. +1 −1 test/client/mocks.js
  116. +19 −17 test/client/stringify.spec.js
  117. +1 −1 test/client/util.spec.js
  118. +2 −19 test/e2e/basic.feature
  119. +41 −13 test/e2e/browser_console.feature
  120. +211 −0 test/e2e/cli.feature
  121. +1 −1 test/e2e/custom-context.feature
  122. +26 −6 test/e2e/error.feature
  123. +7 −7 test/e2e/files.feature
  124. +1 −1 test/e2e/headers.feature
  125. +24 −0 test/e2e/helpful-logs.feature
  126. +2 −2 test/e2e/launcher-error.feature
  127. +2 −2 test/e2e/middleware.feature
  128. +1 −1 test/e2e/module-types.feature
  129. +7 −3 test/e2e/pass-opts.feature
  130. +3 −3 test/e2e/proxy.feature
  131. +7 −1 test/e2e/reconnecting.feature
  132. +26 −0 test/e2e/reporting.feature
  133. +28 −0 test/e2e/restart-on-change.feature
  134. +2 −23 test/e2e/runInParent.feature
  135. +149 −241 test/e2e/step_definitions/core_steps.js
  136. +7 −12 test/e2e/step_definitions/hooks.js
  137. +19 −0 test/e2e/step_definitions/utils.js
  138. +3 −2 test/e2e/stop.feature
  139. +2 −4 test/e2e/support/env.js
  140. +2 −0 test/e2e/support/error/import-something-from-somewhere.js
  141. +36 −31 test/e2e/support/proxy.js
  142. +7 −7 test/e2e/support/reconnecting/test.js
  143. +9 −0 test/e2e/support/reporting/test.js
  144. +145 −54 test/e2e/support/world.js
  145. +8 −8 test/e2e/tag.feature
  146. +3 −3 test/e2e/timeout.feature
  147. +5 −5 test/e2e/upstream-proxy.feature
  148. +3 −0 test/mocha.opts
  149. +65 −59 test/unit/browser.spec.js
  150. +31 −12 test/unit/browser_collection.spec.js
  151. +278 −42 test/unit/cli.spec.js
  152. +227 −58 test/unit/config.spec.js
  153. +2 −2 test/unit/events.spec.js
  154. +72 −21 test/unit/executor.spec.js
  155. +27 −45 test/unit/file-list.spec.js
  156. +15 −0 test/unit/file.spec.js
  157. +36 −41 test/unit/helper.spec.js
  158. +2 −2 test/unit/init.spec.js
  159. +6 −6 test/unit/init/formatters.spec.js
  160. +13 −13 test/unit/init/state_machine.spec.js
  161. +16 −26 test/unit/launcher.spec.js
  162. +27 −47 test/unit/launchers/base.spec.js
  163. +6 −8 test/unit/launchers/capture_timeout.spec.js
  164. +50 −23 test/unit/launchers/process.spec.js
  165. +3 −3 test/unit/logger.spec.js
  166. +99 −45 test/unit/middleware/karma.spec.js
  167. +69 −41 test/unit/middleware/proxy.spec.js
  168. +98 −74 test/unit/middleware/runner.spec.js
  169. +2 −2 test/unit/middleware/source_files.spec.js
  170. +5 −40 test/unit/mocha-globals.js
  171. +110 −0 test/unit/plugin.spec.js
  172. +278 −256 test/unit/preprocessor.spec.js
  173. +104 −29 test/unit/reporter.spec.js
  174. +2 −2 test/unit/reporters/base.spec.js
  175. +1 −1 test/unit/reporters/progress.spec.js
  176. +14 −14 test/unit/runner.spec.js
  177. +189 −51 test/unit/server.spec.js
  178. +30 −0 test/unit/url.spec.js
  179. +0 −42 test/unit/utils/bundle-utils.spec.js
  180. +0 −18 test/unit/utils/json-utils.spec.js
  181. +1 −0 test/unit/utils/net-utils.spec.js
  182. +33 −0 test/unit/utils/pattern-utils.spec.js
  183. +2 −33 test/unit/watcher.spec.js
  184. +8 −12 test/unit/web-server.spec.js
  185. +23 −0 tools/update-contributors.js
  186. +25 −0 tools/update-docs.js
  187. +0 −7,426 yarn.lock
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
test/e2e/support/sandbox
test/e2e/support/error/under-test.js
test/unit/fixtures/bundled.js
static/karma.js
static/context.js
tmp/*
File renamed without changes.
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: Bug report
about: Create an actionable bug report
title: ''
labels: ''
assignees: ''

---

Please read https://karma-runner.github.io/4.0/intro/troubleshooting.html first
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:
linux:
name: Linux - Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v2
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 lint
35 changes: 35 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Release

on:
push:
branches:
- master

jobs:
main:
name: Test, Tag Commit and Release to NPM
runs-on: ubuntu-latest
env:
BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
GITHUB_TOKEN: ${{ secrets.KARMARUNNERBOT_GITHUB_TOKEN }}
KARMA_TEST_NO_FALLBACK: 1
steps:
- uses: actions/checkout@v2
with:
token: ${{ env.GITHUB_TOKEN }}
- uses: actions/setup-node@v2
with:
node-version: 16
cache: npm
- run: npm ci
- run: npm run lint
- run: npm run build:check
- run: npm run test:unit
- run: npm run test:e2e
- run: npm run test:client
- run: npm run test:integration
- run: npm run semantic-release
59 changes: 59 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Test

on:
pull_request:
branches:
- master

jobs:
main:
name: Unit (Client and Server), E2E and Integration Test
runs-on: ubuntu-latest
env:
BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: actions/setup-node@v2
with:
node-version: 16
cache: npm
- run: npm ci
- run: npm run build:check
- run: npm run test:unit
- run: npm run test:e2e
- run: npm run test:client
- run: npm run test:integration
linux:
name: "Node ${{ matrix.node }} on Linux: Server Unit and E2E Test"
runs-on: ubuntu-latest
strategy:
matrix:
node: [10, 12, 14, 18]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
cache: npm
- run: npm ci
- run: npm run test:unit
- run: npm run test:e2e
windows:
name: "Node ${{ matrix.node }} on Windows: Server Unit and Client Unit Test"
runs-on: windows-latest
strategy:
matrix:
node: [10, 12, 14, 16, 18]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
cache: npm
- run: npm ci
- run: npm run test:unit
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
node_modules
npm-debug.log
static/context.js
static/karma.js
.idea/*
*.iml
tmp/*
docs/_build
*.swp
*.swo
test/e2e/console.log
test/e2e/support/sandbox
test/e2e/coverage/coverage
test/e2e/coverageQunit/coverage
test/e2e/coverageRequirejs/coverage
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
tmp
test
tasks
/tools/
docs
client
logo
46 changes: 0 additions & 46 deletions .travis.yml

This file was deleted.

Loading