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: v5.0.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: v5.0.5
Choose a head ref
  • 9 commits
  • 21 files changed
  • 2 contributors

Commits on Apr 30, 2020

  1. refactor(test): extract proxy into a separate Given claim (#3492)

    First step to simplify execKarma method, which is overcomplicated and has too many responsibilities.
    devoto13 authored Apr 30, 2020
    Configuration menu
    Copy the full SHA
    b788f94 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2020

  1. refactor(test): adjust sandbox folder location and simplify config lo…

    …gic (#3493)
    
    This is a bit bigger change, but modifications are closely related and I think it makes sense to land them all together.
    
    The main change is in test/e2e/support/world.js file, where all important paths are defined:
    
    - `workDir` is the current working directory for the tested Karma process - `test/e2e/support`. Same as before.
    - `sandboxDir` moved from `tmp/sandbox` in the repository root to `test/e2e/support/sandbox`. Sandbox directory is reset before every scenario (see `test/e2e/step_definitions/hooks.js`) and this is where all generated files should be (hence change of paths in `browser_console.feature`). This also makes things cleaner as now all paths in the .feature files are relative to `workDir`.
    - `configFile` is path where Karma config file is generated. It no longer contains hash as it was not really needed. It may be re-introduced later if tests are run in parallel, but then it makes more sense to have it as a part of `sandboxDir` instead.
    - `karmaExecutable` is an absolute path to the Karma executable.
    
    The change from `__dirname + '/` to `_resolve('` in two .feature files is to avoid having two different hacks to resolve absolute paths.
    
    The last change in this file is to simplify config generation methods.
    
    Remaining changes in `test/e2e/step_definitions/core_steps.js` are adapting steps to the above changes by removing bunch of boilerplate, which is no longer necessary.
    devoto13 authored May 1, 2020
    Configuration menu
    Copy the full SHA
    0bd5c2b View commit details
    Browse the repository at this point in the history

Commits on May 5, 2020

  1. refactor(test): write config file in its own steps (#3494)

    From the description of the steps it makes sense to write it straight away. Also this is more flexible and allows to introduce steps, which do not require config file in the future PR.
    devoto13 authored May 5, 2020
    Configuration menu
    Copy the full SHA
    e4a5126 View commit details
    Browse the repository at this point in the history
  2. refactor(test): add common method to start server in background (#3495)

    The existing code had pretty confusing logic (old lines 33-36)`: when background server start fails it is actually considered a success, but child process is not started. Because of this `lastRun` contains result output of the `karma start`. This is no longer the case, hence two test cases had to be updated as they never executed `karma run` despite the statement and were asserting against `karma start` output. This should be more clear now.
    
    As background server process now has its own variable to store output, there is no need for a dedicated runOut command and it can be removed.
    devoto13 authored May 5, 2020
    Configuration menu
    Copy the full SHA
    a3d1f11 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2020

  1. refactor(test): reduce execKarma to a reasonable size (#3496)

    Finally!
    
    Introduced extra step "I wait until server output contains" instead of hard-coded timeout. It will regularly evaluate a condition until it fulfills. This approach should potentially perform a little bit better than the previous solution.
    devoto13 authored May 6, 2020
    Configuration menu
    Copy the full SHA
    f375884 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2020

  1. refactor(test): move execKarma into the World (#3500)

    Also generalize a step to accept any CLI arguments instead of only log-level. This should make this step more flexible. The removed step was not very clear as to which command it applies to (foreground or background) and is fully covered with expanded "I {command} Karma ..." step.
    devoto13 authored May 7, 2020
    Configuration menu
    Copy the full SHA
    100b227 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4f2fe56 View commit details
    Browse the repository at this point in the history
  3. fix(cli): restore command line help contents (#3502)

    These were lost after migration to yargs as CLI parser.
    
    Fixes #3474
    devoto13 authored May 7, 2020
    Configuration menu
    Copy the full SHA
    e99da31 View commit details
    Browse the repository at this point in the history
  4. chore(release): 5.0.5 [skip ci]

    ## [5.0.5](v5.0.4...v5.0.5) (2020-05-07)
    
    ### Bug Fixes
    
    * **cli:** restore command line help contents ([#3502](#3502)) ([e99da31](e99da31)), closes [#3474](#3474)
    semantic-release-bot committed May 7, 2020
    Configuration menu
    Copy the full SHA
    35d57e9 View commit details
    Browse the repository at this point in the history
Loading