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: 333e7d4060865f32372bf4a3365a6e47a6aeefa1
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: 42933c96d011e2f87e01109aeb07121c6b30d97a
Choose a head ref
37 contributors

Commits on Jun 16, 2018

  1. fix(launcher): Only markCaptured browsers that are launched. (#3047) 

    This is a regression in 2.0.3: if karma server is started and a users browser attached, the launch throws
    @johnjbarton
    johnjbarton authored Jun 16, 2018
    Copy the full SHA
    f8f3ebc View commit details

  2. refactor(temp-dir): update lib/temp_dir.js to ES6 (#3049)

    @lusarz @johnjbarton
    lusarz authored and johnjbarton committed Jun 16, 2018
    Copy the full SHA
    ab3c0e3 View commit details

Commits on Jun 20, 2018

  1. fix(events): bind emitters with for..in. (#3059) 

    Fixes #3057
    @johnjbarton
    johnjbarton authored Jun 20, 2018
    Copy the full SHA
    b99f03f View commit details

  2. fix(server): Resurrect static function Server.start() lost in 2.0.3 (#… 

    …3055)
    @johnjbarton
    johnjbarton authored Jun 20, 2018
    Copy the full SHA
    c88ebc6 View commit details

  3. fix(deps): remove babel-core and babel call in wallaby. (#3044) 

    This change was originally added by @dignifiedquire, but mixed with other changes.
    @johnjbarton
    johnjbarton authored Jun 20, 2018
    Copy the full SHA
    7da8ca0 View commit details

  4. refactor(file-list): clean lib/file-list.js

    @lusarz
    lusarz committed Jun 20, 2018
    Copy the full SHA
    414b84c View commit details

Commits on Jun 21, 2018

  1. fix(server): actually call stert(). (#3062) 

    Warn that the function without a test will be removed
    @johnjbarton
    johnjbarton authored Jun 21, 2018
    Copy the full SHA
    40d836a View commit details

  2. chore: update contributors

    @johnjbarton
    johnjbarton committed Jun 21, 2018
    Copy the full SHA
    f61c936 View commit details

  3. chore: release v2.0.4

    @johnjbarton
    johnjbarton committed Jun 21, 2018
    Copy the full SHA
    dee3615 View commit details

  4. feat(preprocessor): Allow preprocessor to handle binary files (#3054)

    @johnjbarton
    Keen Yee Liau authored and johnjbarton committed Jun 21, 2018
    Copy the full SHA
    7b66e18 View commit details

Commits on Jun 22, 2018

  1. refactor(preprocessor): update lib/preprocessor.js to ES6

    @lusarz
    lusarz committed Jun 22, 2018
    Copy the full SHA
    ad820a1 View commit details

Commits on Jul 11, 2018

  1. fix(server): pass bound port to preventEADDRINUSE issue. (#3065)

    @sergei-startsev @lusarz
    sergei-startsev authored and lusarz committed Jul 11, 2018
    Copy the full SHA
    850a90b View commit details

  2. fix: remove circular reference in Browser 

    After migrating the the `browser.js` file to ES2015, the `Browser` class has now fields with circular references (like `emitter`),
which breaks the Karma JSON reporters available starting with Karma 2.0.1.
This commit removes the circular dependencies by adding a `toJSON()` method to the `Browser` class,
which produces a similar result to the browser object before the migration.

Fixes #3075
    @cexbrayat @lusarz
    cexbrayat authored and lusarz committed Jul 11, 2018
    Copy the full SHA
    518cb11 View commit details

Commits on Jul 12, 2018

  1. fix(middleware): Obey the Promise API. 

    Rather than catching and discarding the error if no error handler is passed, let the promise package chain it. This allows use to have a .catch() follow the then().
    @johnjbarton @lusarz
    johnjbarton authored and lusarz committed Jul 12, 2018
    Copy the full SHA
    93ba05a View commit details

Commits on Jul 16, 2018

  1. fix(doc): Document release steps for admins (#3063)

    @johnjbarton
    johnjbarton authored Jul 16, 2018
    Copy the full SHA
    a701732 View commit details

Commits on Jul 17, 2018

  1. refactor(filelist): rename promise -> lastCompletedRefresh and remove… 

    … unused promise (#3060)
    @johnjbarton
    johnjbarton authored Jul 17, 2018
    Copy the full SHA
    7617279 View commit details

Commits on Jul 23, 2018

  1. fix(browser): ensure browser state is EXECUTING when tests start (#3074) 

    * fix(browser): ensure browser state is EXECUTING when tests start

Browser state is EXECUTING when it actually started to execute tests. This state change is triggered by client on actual tests execution start.

Introduced an additional browser state CONFIGURING

The CONFIGURING state means that the browser is not just CONNECTED for tests, but someone has requested tests execution (and provided a config file). But the provided config file is not yet processed, configuration is not applied or the tests execution is not yet started and we have not received the first event from the remote browser, so the browser object is not yet at EXECUTING state.

Refactored browser state names: renamed READY -> CONNECTED

Fixes #1640
    @johnjbarton
    Alexei authored and johnjbarton committed Jul 23, 2018
    Copy the full SHA
    dc7265b View commit details

Commits on Jul 24, 2018

  1. chore: update contributors

    @johnjbarton
    johnjbarton committed Jul 24, 2018
    Copy the full SHA
    02dc1f4 View commit details

  2. chore: release v2.0.5

    @johnjbarton
    johnjbarton committed Jul 24, 2018
    Copy the full SHA
    0018947 View commit details

Commits on Jul 25, 2018

  1. docs: better clarity for API usage 

    extract config to a var to create better clarity for API usage
    @nirmoav @lusarz
    nirmoav authored and lusarz committed Jul 25, 2018
    Copy the full SHA
    c5dc62d View commit details

  2. chore: remove support for node 4, update log4js (#3082) 

    This PR will start v3.0
    @johnjbarton
    johnjbarton authored Jul 25, 2018
    Copy the full SHA
    94a6728 View commit details

Commits on Jul 26, 2018

  1. fix(config): wait 20s for browser activity. (#3087) 

    On low-horsepower CI systems karma frequently times out waiting for phantomjs. We see this
in our Travis-CI runs. Users also see it: 
karma-runner/karma-phantomjs-launcher#126.
    @johnjbarton
    johnjbarton authored Jul 26, 2018
    Copy the full SHA
    88b977f View commit details

Commits on Jul 27, 2018

  1. fix(travis): Validate TRAVIS_PULL_REQUEST_SHA rather than TRAVIS_COMM… 

    …IT. (#3093)

Also add some debug messages for commits and remove an old node4 command.
    @johnjbarton
    johnjbarton authored Jul 27, 2018
    Copy the full SHA
    a58fa45 View commit details

  2. fix(config): Wait 30s for browser activity per Travis. (#3091) 

    https://docs.travis-ci.com/user/gui-and-headless-browsers/#karma-and-firefox-inactivity-timeouts
    @johnjbarton
    johnjbarton authored Jul 27, 2018
    Copy the full SHA
    f6d2f0e View commit details

Commits on Jul 31, 2018

  1. fix(init): add "ChromeHeadless" to the browsers' options (#3096)

    @Teamop @johnjbarton
    Teamop authored and johnjbarton committed Jul 31, 2018
    Copy the full SHA
    56fda53 View commit details

  2. fix(travis): validate TRAVIS_COMMIT if TRAVIS_PULL_REQUEST_SHA is not… 

    … set. (#3094)

Looks like the pre-merge travis run sets TRAVIS_PULL_REQUEST_SHA but the post-merge run does not.
In the post-merge the TRAVIS_COMMIT should be the PR, so validate it.
    @johnjbarton
    johnjbarton authored Jul 31, 2018
    Copy the full SHA
    fba5d36 View commit details

Commits on Aug 1, 2018

  1. fix(travis): use the value not the key name. (#3097)

    @johnjbarton
    johnjbarton authored Aug 1, 2018
    1
    Copy the full SHA
    90f5546 View commit details

Commits on Aug 4, 2018

  1. chore(deps): update socket.io -> 2.1.1 (#3099)

    @johnjbarton
    johnjbarton authored Aug 4, 2018
    1
    Copy the full SHA
    0fdd8f9 View commit details

  2. fix(server): Exit clean on unhandledRejections. (#3092) 

    Add a handler for unhandledRejections, log error and disconnect all, then exit.
Also remove broken, untested rejection handler in middleware. Prior to #3064,
this block was probably unreachable; the arguments to serveStaticFile are incorrect.
    @johnjbarton
    johnjbarton authored Aug 4, 2018
    Copy the full SHA
    02f54c6 View commit details

Commits on Aug 5, 2018

  1. chore(ci): drop node 9 from travis tests (#3100)

    @johnjbarton
    johnjbarton authored Aug 5, 2018
    Copy the full SHA
    1002569 View commit details

Commits on Aug 7, 2018

  1. Remove erroneous change log entries for 2.0.3 

    Fixes #3105
    @johnjbarton
    johnjbarton authored Aug 7, 2018
    1
    Copy the full SHA
    173848e View commit details

  2. fix(travis): Up the socket timeout 2->20s. (#3103) 

    Log something on all disconnect() calls.
Up the timeout as suggested by ndcornelius@ on #3102
    @johnjbarton
    johnjbarton authored Aug 7, 2018
    Copy the full SHA
    732396a View commit details

Commits on Aug 9, 2018

  1. chore(deps): update mime -> 2.3.1 (#3107) 

    This is the same as @dignifiedrequire #2997 first commit
    @johnjbarton
    johnjbarton authored Aug 9, 2018
    Copy the full SHA
    eb3b1b4 View commit details

  2. chore: update contributors

    @johnjbarton
    johnjbarton committed Aug 9, 2018
    Copy the full SHA
    5db9399 View commit details

  3. chore: release v2.0.6

    @johnjbarton
    johnjbarton committed Aug 9, 2018
    Copy the full SHA
    75f466d View commit details

  4. chore: release v3.0.0

    @johnjbarton
    johnjbarton committed Aug 9, 2018
    Copy the full SHA
    a4d5bdc View commit details

Commits on Aug 10, 2018

  1. docs(readme): update BREAKING CHANGES in CHANGELOG (#3109)

    @sibiraj-s @johnjbarton
    sibiraj-s authored and johnjbarton committed Aug 10, 2018
    Copy the full SHA
    33ed285 View commit details

Commits on Aug 13, 2018

  1. feat(config): Add config option for browser socket timeout (#3102) 

    Add a configuration option that allows modification
of the default timeout value for the client socket
connection. The previous hardcoded value of 2000
(ms) was insufficent for some environments.

Closes #2927
    @ndcornelius @johnjbarton
    ndcornelius authored and johnjbarton committed Aug 13, 2018
    Copy the full SHA
    11e3a9d View commit details

  2. fix(init): Support ChromeHeadless in validateBrowser (#3110)

    @ikesyo @johnjbarton
    ikesyo authored and johnjbarton committed Aug 13, 2018
    Copy the full SHA
    eeadcf2 View commit details

Commits on Aug 30, 2018

  1. fix(runner): Make exit code configurable when tests are failing (#3116) 

    Fixes #1300
    @andreaspsson @johnjbarton
    andreaspsson authored and johnjbarton committed Aug 30, 2018
    Copy the full SHA
    74da748 View commit details

Commits on Sep 5, 2018

  1. feat(frameworks): report start() errors back to server. (#3126)

    @johnjbarton
    johnjbarton authored Sep 5, 2018
    Copy the full SHA
    8257375 View commit details

  2. Create pull request template.

    @johnjbarton
    johnjbarton authored Sep 5, 2018
    Copy the full SHA
    301b2d6 View commit details

  3. fix(runner): Do not persist grep option across runs (#3121)

    @jvalkeejarvi @johnjbarton
    jvalkeejarvi authored and johnjbarton committed Sep 5, 2018
    Copy the full SHA
    c91cb81 View commit details

Commits on Sep 6, 2018

  1. feat(server): Add support for encoded source files (#3123)

    @GreenGremlin @johnjbarton
    GreenGremlin authored and johnjbarton committed Sep 6, 2018
    Copy the full SHA
    68b37d3 View commit details

  2. fix(middleware): simplify stripHost. (#3115) 

    The stripHost middleware only adds a modified url to the request.
That modified url is only used one place. By converting the middleware
to a module, the code is simpler and beforeMiddleware modules can reuse
karma middleware. (One alternative considered was to move the stripHost
in the chain before the beforeMiddleware, but this form seems better).

Clean up regex per offline suggestion from zzo@
    @johnjbarton
    johnjbarton authored Sep 6, 2018
    Copy the full SHA
    d65e911 View commit details

Commits on Sep 23, 2018

  1. docs(config): customized typeScript configuration (#3140)

    @alan-agius4 @johnjbarton
    alan-agius4 authored and johnjbarton committed Sep 23, 2018
    Copy the full SHA
    6742ecf View commit details

Commits on Oct 1, 2018

  1. chore(license): change year to 2018

    @JandersonConstantino @lusarz
    JandersonConstantino authored and lusarz committed Oct 1, 2018
    Copy the full SHA
    20eab32 View commit details

Commits on Oct 2, 2018

  1. docs: Updated supported Node versions in the documentation (#3155) 

    * docs: update information on supported node versions

* docs: update links to point to latest version on the website
    @devoto13 @johnjbarton
    devoto13 authored and johnjbarton committed Oct 2, 2018
    Copy the full SHA
    f71da20 View commit details

Commits on Oct 3, 2018

  1. refactor(server): replace var with const/let (#3152)

    @lusarz @johnjbarton
    lusarz authored and johnjbarton committed Oct 3, 2018
    2
    Copy the full SHA
    c67b90a View commit details

  2. refactor(launcher): use this directly instead assign to self variable… 

    … in base launcher (#3157)
    @lusarz @johnjbarton
    lusarz authored and johnjbarton committed Oct 3, 2018
    Copy the full SHA
    f68087c View commit details
Showing with 5,453 additions and 6,039 deletions.
  1. +7 −6 .travis.yml
  2. +177 −285 CHANGELOG.md
  3. +1 −1 CONTRIBUTING.md
  4. +1 −1 LICENSE
  5. +3 −0 PULL_REQUEST_TEMPLATE.md
  6. +0 −2 appveyor.yml
  7. +1 −0 client/constants.js
  8. +48 −19 client/karma.js
  9. +3 −2 client/main.js
  10. +1 −1 client/updater.js
  11. +15 −5 context/karma.js
  12. +40 −3 docs/config/01-configuration-file.md
  13. +11 −7 docs/config/02-files.md
  14. +12 −0 docs/dev/03-maintaining.md
  15. +10 −1 docs/dev/04-public-api.md
  16. +11 −0 docs/dev/05-plugins.md
  17. +1 −1 docs/intro/01-installation.md
  18. +1 −2 docs/intro/04-faq.md
  19. +12 −2 docs/intro/05-troubleshooting.md
  20. +11 −1 docs/plus/02-travis.md
  21. +102 −112 lib/browser.js
  22. +35 −41 lib/browser_collection.js
  23. +3 −2 lib/browser_result.js
  24. +12 −7 lib/cli.js
  25. +28 −68 lib/completion.js
  26. +54 −87 lib/config.js
  27. +1 −6 lib/emitter_wrapper.js
  28. +3 −2 lib/events.js
  29. +9 −16 lib/executor.js
  30. +113 −267 lib/file-list.js
  31. +4 −0 lib/file.js
  32. +15 −3 lib/helper.js
  33. +16 −23 lib/init.js
  34. +2 −2 lib/init/color_schemes.js
  35. +7 −7 lib/init/state_machine.js
  36. +9 −11 lib/launcher.js
  37. +33 −24 lib/launchers/base.js
  38. +9 −10 lib/launchers/capture_timeout.js
  39. +30 −29 lib/launchers/process.js
  40. +10 −13 lib/launchers/retry.js
  41. +8 −8 lib/logger.js
  42. +35 −55 lib/middleware/common.js
  43. +114 −124 lib/middleware/karma.js
  44. +44 −75 lib/middleware/proxy.js
  45. +14 −13 lib/middleware/runner.js
  46. +12 −3 lib/middleware/source_files.js
  47. +1 −1 lib/middleware/stopper.js
  48. +4 −11 lib/middleware/strip_host.js
  49. +4 −4 lib/plugin.js
  50. +41 −50 lib/preprocessor.js
  51. +12 −9 lib/reporter.js
  52. +4 −5 lib/reporters/base.js
  53. +2 −2 lib/reporters/dots.js
  54. +2 −2 lib/reporters/dots_color.js
  55. +2 −2 lib/reporters/progress.js
  56. +2 −2 lib/reporters/progress_color.js
  57. +89 −36 lib/server.js
  58. +13 −17 lib/stopper.js
  59. +13 −12 lib/temp_dir.js
  60. +14 −0 lib/utils/crypto-utils.js
  61. +10 −0 lib/utils/json-utils.js
  62. +14 −19 lib/utils/net-utils.js
  63. +14 −0 lib/utils/pattern-utils.js
  64. +28 −35 lib/watcher.js
  65. +22 −5 lib/web-server.js
  66. +122 −108 package.json
  67. +6 −1 static/context.html
  68. +6 −1 static/debug.html
  69. +2 −2 tasks/init-dev-env.js
  70. +6 −6 tasks/test.js
  71. +94 −51 test/client/karma.spec.js
  72. +1 −1 test/client/mocks.js
  73. +16 −16 test/client/stringify.spec.js
  74. +1 −1 test/client/util.spec.js
  75. +4 −4 test/e2e/basic.feature
  76. +53 −17 test/e2e/browser_console.feature
  77. +3 −3 test/e2e/custom-context.feature
  78. +6 −6 test/e2e/displayname.feature
  79. +19 −3 test/e2e/error.feature
  80. +21 −21 test/e2e/files.feature
  81. +3 −3 test/e2e/headers.feature
  82. +8 −8 test/e2e/load.feature
  83. +6 −6 test/e2e/middleware.feature
  84. +7 −7 test/e2e/mocharepoter.feature
  85. +35 −0 test/e2e/module-types.feature
  86. +2 −2 test/e2e/pass-opts.feature
  87. +9 −9 test/e2e/proxy.feature
  88. +8 −3 test/e2e/reconnecting.feature
  89. +4 −4 test/e2e/runInParent.feature
  90. +63 −57 test/e2e/step_definitions/core_steps.js
  91. +2 −2 test/e2e/step_definitions/hooks.js
  92. +7 −7 test/e2e/stop.feature
  93. +1 −1 test/e2e/support/env.js
  94. +1 −1 test/e2e/support/headers/test.js
  95. +1 −1 test/e2e/support/middleware/test.js
  96. +11 −0 test/e2e/support/modules/__tests__/minus.test.mjs
  97. +11 −0 test/e2e/support/modules/__tests__/plus.test.js
  98. +4 −0 test/e2e/support/modules/minus.mjs
  99. +4 −0 test/e2e/support/modules/plus.js
  100. +5 −5 test/e2e/support/proxy.js
  101. +1 −1 test/e2e/support/proxy/test.js
  102. +2 −1 test/e2e/support/reconnecting/test.js
  103. +2 −2 test/e2e/support/tag/tag.js
  104. +14 −11 test/e2e/support/world.js
  105. +3 −3 test/e2e/upstream-proxy.feature
  106. +95 −51 test/unit/browser.spec.js
  107. +97 −33 test/unit/browser_collection.spec.js
  108. +2 −2 test/unit/browser_result.spec.js
  109. +6 −6 test/unit/cli.spec.js
  110. +45 −45 test/unit/config.spec.js
  111. +36 −22 test/unit/events.spec.js
  112. +1 −1 test/unit/executor.spec.js
  113. +53 −36 test/unit/file-list.spec.js
  114. +45 −9 test/unit/helper.spec.js
  115. +39 −39 test/unit/init.spec.js
  116. +10 −10 test/unit/init/formatters.spec.js
  117. +30 −30 test/unit/init/state_machine.spec.js
  118. +35 −31 test/unit/launcher.spec.js
  119. +33 −33 test/unit/launchers/base.spec.js
  120. +6 −6 test/unit/launchers/capture_timeout.spec.js
  121. +61 −40 test/unit/launchers/process.spec.js
  122. +11 −11 test/unit/launchers/retry.spec.js
  123. +6 −6 test/unit/logger.spec.js
  124. +82 −35 test/unit/middleware/karma.spec.js
  125. +47 −48 test/unit/middleware/proxy.spec.js
  126. +266 −256 test/unit/middleware/runner.spec.js
  127. +54 −18 test/unit/middleware/source_files.spec.js
  128. +16 −49 test/unit/middleware/strip_host.spec.js
  129. +10 −10 test/unit/mocha-globals.js
  130. +2 −2 test/unit/mocks/timer.js
  131. +98 −73 test/unit/preprocessor.spec.js
  132. +71 −71 test/unit/reporter.spec.js
  133. +2 −2 test/unit/reporters/base.spec.js
  134. +4 −4 test/unit/reporters/progress.spec.js
  135. +14 −14 test/unit/runner.spec.js
  136. +130 −43 test/unit/server.spec.js
  137. +1 −1 test/unit/utils/bundle-utils.spec.js
  138. +9 −0 test/unit/utils/crypto-utils.spec.js
  139. +18 −0 test/unit/utils/json-utils.spec.js
  140. +20 −33 test/unit/utils/net-utils.spec.js
  141. +33 −0 test/unit/utils/pattern-utils.spec.js
  142. +15 −46 test/unit/watcher.spec.js
  143. +36 −34 test/unit/web-server.spec.js
  144. +0 −7 wallaby.js
  145. +1,961 −2,948 yarn.lock
13 changes: 7 additions & 6 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
sudo: false
language: node_js
node_js:
- 4
- 6
- 8
- 9
- 10

env:
@@ -15,13 +12,13 @@ env:
matrix:
fast_finish: true
include:
- node_js: "8"
- name: "Lint code and commit message format"
node_js: "8"
env: VALIDATE_COMMIT_MSG=true LINT=true

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

addons:
firefox:
@@ -37,7 +34,11 @@ 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 ./scripts/validate-commit-msg.sh $TRAVIS_COMMIT; fi'
- echo "TRAVIS_COMMIT $TRAVIS_COMMIT"
- echo "TRAVIS_PULL_REQUEST_SHA $TRAVIS_PULL_REQUEST_SHA"
- COMMIT_TO_VALIDATE=${TRAVIS_PULL_REQUEST_SHA:-$TRAVIS_COMMIT}
- echo "COMMIT_TO_VALIDATE $COMMIT_TO_VALIDATE"
- 'if [ "$VALIDATE_COMMIT_MSG" == "true" ]; then ./scripts/validate-commit-msg.sh $COMMIT_TO_VALIDATE; fi'
- 'if [ "$LINT" == "true" ]; then npm run lint; fi'

script:
Loading