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: ead31cd99238da86ab8b2d8ff5aff465959f4106
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: ab4b32898bcb4e0ba3a1e99835d30c113db3eeeb
Choose a head ref
28 contributors
Loading
Showing with 8,331 additions and 11,831 deletions.
  1. +1 −1 .github/ISSUE_TEMPLATE/bug_report.md
  2. +35 −0 .github/workflows/release.yml
  3. +61 −0 .github/workflows/test.yml
  4. +0 −44 .travis.yml
  5. +374 −147 CHANGELOG.md
  6. +1 −1 CODE_OF_CONDUCT.md
  7. +2 −2 CONTRIBUTING.md
  8. +1 −1 LICENSE
  9. +5 −5 README.md
  10. +11 −0 SECURITY.md
  11. +0 −36 appveyor.yml
  12. +57 −51 client/karma.js
  13. +5 −4 client/main.js
  14. +47 −13 client/updater.js
  15. +1 −1 commitlint.config.js
  16. +5 −5 config.tpl.coffee
  17. +5 −5 config.tpl.js
  18. +5 −5 config.tpl.ls
  19. +5 −5 config.tpl.ts
  20. +3 −3 context/karma.js
  21. +1 −1 context/main.js
  22. +1 −1 docs/about/01-versioning.md
  23. +5 −4 docs/about/03-migration.md
  24. +20 −15 docs/config/01-configuration-file.md
  25. +42 −21 docs/config/02-files.md
  26. +3 −3 docs/config/03-browsers.md
  27. +5 −5 docs/config/04-preprocessors.md
  28. +31 −21 docs/config/05-plugins.md
  29. +3 −1 docs/dev/01-contributing.md
  30. +14 −13 docs/dev/02-making-changes.md
  31. +4 −4 docs/dev/03-maintaining.md
  32. +259 −32 docs/dev/04-public-api.md
  33. +142 −45 docs/dev/05-plugins.md
  34. +22 −23 docs/dev/06-git-commit-msg.md
  35. +2 −0 docs/index.md
  36. +3 −3 docs/intro/01-installation.md
  37. +2 −2 docs/intro/02-configuration.md
  38. +3 −1 docs/intro/04-faq.md
  39. +6 −4 docs/intro/05-troubleshooting.md
  40. +3 −1 docs/plus/01-requirejs.md
  41. +6 −4 docs/plus/02-travis.md
  42. +5 −3 docs/plus/03-jenkins.md
  43. +2 −0 docs/plus/04-semaphore.md
  44. +3 −1 docs/plus/06-angularjs.md
  45. +1 −1 docs/plus/07-yeoman.md
  46. +77 −75 docs/plus/08-emberjs.md
  47. +1 −1 docs/plus/09-codio.md
  48. +3 −1 docs/plus/10-teamcity.md
  49. +0 −112 gruntfile.js
  50. +35 −24 lib/browser.js
  51. +82 −31 lib/cli.js
  52. +148 −35 lib/config.js
  53. +2 −2 lib/constants.js
  54. +2 −14 lib/helper.js
  55. +1 −14 lib/index.js
  56. +1 −1 lib/init.js
  57. +1 −1 lib/launchers/capture_timeout.js
  58. +5 −0 lib/launchers/process.js
  59. +12 −10 lib/middleware/karma.js
  60. +7 −11 lib/middleware/proxy.js
  61. +50 −5 lib/plugin.js
  62. +4 −32 lib/preprocessor.js
  63. +11 −2 lib/reporter.js
  64. +31 −6 lib/runner.js
  65. +119 −98 lib/server.js
  66. +32 −4 lib/stopper.js
  67. +9 −2 lib/web-server.js
  68. +5,007 −10,086 package-lock.json
  69. +54 −52 package.json
  70. +22 −2 release.config.js
  71. +29 −3 scripts/client.js
  72. +1 −1 scripts/karma-completion.sh
  73. +2 −2 static/client.html
  74. +1 −1 static/client_with_context.html
  75. +4 −4 static/context.js
  76. +1 −1 static/debug.html
  77. +109 −68 static/karma.js
  78. +0 −48 tasks/test.js
  79. +20 −60 test/client/karma.conf.js
  80. +70 −17 test/client/karma.spec.js
  81. +4 −2 test/client/stringify.spec.js
  82. +1 −1 test/e2e/basic.feature
  83. +23 −0 test/e2e/browser_console.feature
  84. +51 −11 test/e2e/cli.feature
  85. +16 −0 test/e2e/error.feature
  86. +1 −1 test/e2e/helpful-logs.feature
  87. +1 −1 test/e2e/module-types.feature
  88. +1 −0 test/e2e/reconnecting.feature
  89. +28 −0 test/e2e/restart-on-change.feature
  90. +1 −1 test/e2e/runInParent.feature
  91. +34 −1 test/e2e/step_definitions/core_steps.js
  92. +2 −0 test/e2e/support/error/import-something-from-somewhere.js
  93. +7 −8 test/e2e/support/reconnecting/test.js
  94. +2 −2 test/e2e/tag.feature
  95. +1 −1 test/e2e/timeout.feature
  96. +3 −0 test/mocha.opts
  97. +24 −18 test/unit/browser.spec.js
  98. +272 −36 test/unit/cli.spec.js
  99. +158 −11 test/unit/config.spec.js
  100. +10 −23 test/unit/helper.spec.js
  101. +46 −18 test/unit/launchers/process.spec.js
  102. +51 −6 test/unit/middleware/karma.spec.js
  103. +34 −26 test/unit/middleware/proxy.spec.js
  104. +5 −3 test/unit/mocha-globals.js
  105. +110 −0 test/unit/plugin.spec.js
  106. +117 −176 test/unit/preprocessor.spec.js
  107. +75 −0 test/unit/reporter.spec.js
  108. +12 −12 test/unit/runner.spec.js
  109. +71 −104 test/unit/server.spec.js
  110. +0 −1 test/unit/web-server.spec.js
  111. +5 −4 tools/update-docs.js
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
View file
Original file line number Diff line number Diff line change
@@ -7,4 +7,4 @@ assignees: ''

---

Please read http://karma-runner.github.io/4.0/intro/troubleshooting.html first
Please read https://karma-runner.github.io/4.0/intro/troubleshooting.html first
35 changes: 35 additions & 0 deletions .github/workflows/release.yml
View file
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: 14
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
61 changes: 61 additions & 0 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Test

on:
pull_request:
branches:
- master

jobs:
main:
name: Lint and 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: 14
cache: npm
- run: npm ci
- run: npm run commitlint -- --from `git merge-base origin/master $GITHUB_SHA`
- 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
linux:
name: "Node ${{ matrix.node }} on Linux: Server Unit and E2E Test"
runs-on: ubuntu-latest
strategy:
matrix:
node: [10, 12]
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]
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
44 changes: 0 additions & 44 deletions .travis.yml
View file

This file was deleted.

Loading