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: 2b71a3c6a01757e0b5c1bf8d241b588656b62127
Choose a head ref
Loading
Showing with 3,494 additions and 4,684 deletions.
  1. +1 −1 .github/ISSUE_TEMPLATE/bug_report.md
  2. +3 −4 .travis.yml
  3. +288 −147 CHANGELOG.md
  4. +1 −1 CODE_OF_CONDUCT.md
  5. +2 −2 CONTRIBUTING.md
  6. +1 −1 LICENSE
  7. +5 −5 README.md
  8. +2 −4 appveyor.yml
  9. +44 −49 client/karma.js
  10. +3 −3 client/main.js
  11. +47 −13 client/updater.js
  12. +5 −5 config.tpl.coffee
  13. +5 −5 config.tpl.js
  14. +5 −5 config.tpl.ls
  15. +5 −5 config.tpl.ts
  16. +3 −3 context/karma.js
  17. +1 −1 context/main.js
  18. +1 −1 docs/about/01-versioning.md
  19. +5 −4 docs/about/03-migration.md
  20. +8 −12 docs/config/01-configuration-file.md
  21. +42 −21 docs/config/02-files.md
  22. +3 −3 docs/config/03-browsers.md
  23. +5 −5 docs/config/04-preprocessors.md
  24. +31 −21 docs/config/05-plugins.md
  25. +3 −1 docs/dev/01-contributing.md
  26. +7 −9 docs/dev/02-making-changes.md
  27. +3 −3 docs/dev/03-maintaining.md
  28. +259 −32 docs/dev/04-public-api.md
  29. +142 −45 docs/dev/05-plugins.md
  30. +4 −2 docs/dev/06-git-commit-msg.md
  31. +2 −0 docs/index.md
  32. +3 −3 docs/intro/01-installation.md
  33. +2 −2 docs/intro/02-configuration.md
  34. +3 −1 docs/intro/04-faq.md
  35. +6 −4 docs/intro/05-troubleshooting.md
  36. +3 −1 docs/plus/01-requirejs.md
  37. +6 −4 docs/plus/02-travis.md
  38. +5 −3 docs/plus/03-jenkins.md
  39. +2 −0 docs/plus/04-semaphore.md
  40. +3 −1 docs/plus/06-angularjs.md
  41. +1 −1 docs/plus/07-yeoman.md
  42. +77 −75 docs/plus/08-emberjs.md
  43. +1 −1 docs/plus/09-codio.md
  44. +3 −1 docs/plus/10-teamcity.md
  45. +0 −112 gruntfile.js
  46. +35 −24 lib/browser.js
  47. +82 −31 lib/cli.js
  48. +143 −31 lib/config.js
  49. +1 −14 lib/index.js
  50. +1 −1 lib/init.js
  51. +5 −0 lib/launchers/process.js
  52. +9 −7 lib/middleware/karma.js
  53. +7 −11 lib/middleware/proxy.js
  54. +50 −5 lib/plugin.js
  55. +4 −32 lib/preprocessor.js
  56. +31 −6 lib/runner.js
  57. +113 −98 lib/server.js
  58. +32 −4 lib/stopper.js
  59. +9 −2 lib/web-server.js
  60. +723 −3,150 package-lock.json
  61. +33 −34 package.json
  62. +29 −3 scripts/client.js
  63. +1 −1 scripts/karma-completion.sh
  64. +1 −1 static/client.html
  65. +1 −1 static/client_with_context.html
  66. +4 −4 static/context.js
  67. +94 −65 static/karma.js
  68. +0 −48 tasks/test.js
  69. +11 −47 test/client/karma.conf.js
  70. +44 −14 test/client/karma.spec.js
  71. +4 −2 test/client/stringify.spec.js
  72. +50 −10 test/e2e/cli.feature
  73. +16 −0 test/e2e/error.feature
  74. +1 −1 test/e2e/helpful-logs.feature
  75. +1 −0 test/e2e/reconnecting.feature
  76. +2 −0 test/e2e/support/error/import-something-from-somewhere.js
  77. +7 −8 test/e2e/support/reconnecting/test.js
  78. +3 −0 test/mocha.opts
  79. +24 −18 test/unit/browser.spec.js
  80. +272 −36 test/unit/cli.spec.js
  81. +158 −11 test/unit/config.spec.js
  82. +46 −18 test/unit/launchers/process.spec.js
  83. +47 −2 test/unit/middleware/karma.spec.js
  84. +34 −26 test/unit/middleware/proxy.spec.js
  85. +5 −3 test/unit/mocha-globals.js
  86. +110 −0 test/unit/plugin.spec.js
  87. +117 −176 test/unit/preprocessor.spec.js
  88. +12 −12 test/unit/runner.spec.js
  89. +71 −104 test/unit/server.spec.js
  90. +0 −1 test/unit/web-server.spec.js
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
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
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -6,20 +6,19 @@ jobs:
include:
- node_js: "10"
script:
- npm run init
- npm run test:unit
- npm run test:e2e

- node_js: "12"
script:
- npm run init
- npm run test:unit
- npm run test:e2e

- node_js: "14"
script:
- npm run init
- commitlint-travis
- if [[ "$TRAVIS_BRANCH" != "master" ]]; then
commitlint-travis;
fi;
- npm run lint
- npm run build:check
- npm run test:unit
Loading