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: v1.0.0
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: v1.1.0
Choose a head ref
  • 14 commits
  • 34 files changed
  • 4 contributors

Commits on Jun 23, 2016

  1. feat: Allow frameworks to inject middleware 

    The Server#_start function was injected with `webServer` and `socketServer`. This prevents frameworks from being able to manipulate `config.middleware` before those servers are created.

The solution is simply to defer injection until after all frameworks have loaded, and then fetch those values with `injector.get`.

There were no e2e tests involving middleware. I have added two, including one that verifies the new capabilities.
    @jamestalmage
    jamestalmage committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    d972f3d View commit details
    Browse the repository at this point in the history

  2. test: Verify frameworks can add proxies 

    Fixes #1110
    @jamestalmage
    jamestalmage committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    3edecb1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2183 from jamestalmage/allow-frameworks-to-inject… 

    …-middleware

Allow frameworks to inject middleware
    @dignifiedquire
    dignifiedquire authored Jun 23, 2016
    Configuration menu
    Copy the full SHA
    9079348 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2016

  1. fix(server): log browser messages to the terminal 

    Fixes #2187
    @dignifiedquire
    dignifiedquire committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    d1f924c View commit details
    Browse the repository at this point in the history

  2. fix(deps): freeze socket.io version 

    [email protected] breaks IE <= 9 compat, this freezes the version until socketio/engine.io#407 is resolved.
    @dignifiedquire
    dignifiedquire committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    73e300d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2193 from karma-runner/fix-log 

    fix(server): log browser messages to the terminal
    @dignifiedquire
    dignifiedquire authored Jun 26, 2016
    Configuration menu
    Copy the full SHA
    21315e8 View commit details
    Browse the repository at this point in the history

  4. test(deps): update cucumber

    @dignifiedquire
    dignifiedquire committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    c19a9b4 View commit details
    Browse the repository at this point in the history

  5. test(deps): upgrade to babel@6

    @dignifiedquire
    dignifiedquire committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    3b56f63 View commit details
    Browse the repository at this point in the history

  6. refactor(client): Transferred lots of client logic to context, adding… 

    … Electron support via postMessage
    @twolfson
    twolfson committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    81b1f04 View commit details
    Browse the repository at this point in the history

  7. chore: resetup wallabyjs for babel

    @maksimr
    maksimr committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    d3c132f View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1984 from twolfson/dev/use.context.window.sqwished 

    Transition from contextWindow to postMessage
    @dignifiedquire
    dignifiedquire authored Jun 26, 2016
    Configuration menu
    Copy the full SHA
    fc0421f View commit details
    Browse the repository at this point in the history

  9. Merge pull request #2154 from maksimr/master 

    chore: resetup wallabyjs for babel
    @dignifiedquire
    dignifiedquire authored Jun 26, 2016
    Configuration menu
    Copy the full SHA
    48e8b71 View commit details
    Browse the repository at this point in the history

  10. chore: update contributors

    @dignifiedquire
    dignifiedquire committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    c27a6e3 View commit details
    Browse the repository at this point in the history

  11. chore: release v1.1.0

    @dignifiedquire
    dignifiedquire committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    419b918 View commit details
    Browse the repository at this point in the history
Loading