karma-runner · Sep 9, 2016 · Sep 11, 2016 · Sep 13, 2016 · Sep 13, 2016 · Sep 14, 2016
diff --git a/.babelrc b/.babelrc
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ tmp/*
 docs/_build
 *.swp
 *.swo
+test/e2e/console.log
 test/e2e/coverage/coverage
 test/e2e/coverageQunit/coverage
 test/e2e/coverageRequirejs/coverage

diff --git a/.mailmap b/.mailmap
@@ -1,3 +1,4 @@
 <bitwiseman@gmail.com> <lnewman@book.com>
 <vojta.jina@gmail.com> <vojta@google.com>
 <friedel.ziegelmayer@gmail.com> <dignifiedquire@gmail.com>
+Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
diff --git a/.npmignore b/.npmignore
@@ -4,9 +4,7 @@
 tmp
 test
 tasks
-scripts
 docs
-client
 logo
 integration-tests
 
@@ -16,6 +14,8 @@ Gruntfile.coffee
 credentials
 Karma.sublime-*
 
+static/karma.js
+static/context.js
 static/karma.src.js
 static/karma.wrapper
 test-results.xml

diff --git a/.travis.yml b/.travis.yml
@@ -1,25 +1,26 @@
 sudo: false
 language: node_js
 node_js:
-  - "0.10"
-  - "0.12"
   - 4
-  - 5
   - 6
+  - 8
+  - 9
 
 env:
   global:
   - SAUCE_USERNAME: karmarunnerbot
   - secure: "bRVY+hYZwMf1SqVnMyZRJTLD0gN1hLx9/MwO8MM/qBiu3YNjXy49XElfMdzMKN6cZeKTmhcnjmZonbJuI1PQ2t+utGkyjnlVLJ/OlWptreKLzIlcbt4hrdPoTcjmUTwDWq9Ex9cVoYX8AzCasETttpczp3P+s3+vmOUj8z25JyU="
   - CXX=g++-4.8
+matrix:
+  fast_finish: true
   include:
-  - node_js: "5"
-    env: VALIDATE_COMMIT_MSG=TRUE
+    - node_js: "8"
+      env: VALIDATE_COMMIT_MSG=true LINT=true
 
 before_install:
   - npm config set loglevel warn
   - g++-4.8 --version
-  - npm install -g npm
+  - if [[ "`node --version`" = v4* ]]; then npm install -g npm@latest-3; fi
 
 addons:
   firefox:
@@ -35,6 +36,8 @@ 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'
+  - 'if [ "$LINT" == "true" ]; then npm run lint; fi'
 
 script:
-  - 'if [ "${VALIDATE_COMMIT_MSG}" != "TRUE" ]; then npm run travis; else ./scripts/validate-commit-msg.sh "${TRAVIS_COMMIT}"; fi'
+  - npm run travis
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,162 @@
+<a name="2.0.0"></a>
+# [2.0.0](https://github.com/karma-runner/karma/compare/v1.7.1...v2.0.0) (2017-12-21)
+
+
+### Bug Fixes
+
+* **config:** Call debug log methods after setting the loglevel based upon config/cli-options. ([99fd3f0](https://github.com/karma-runner/karma/commit/99fd3f0))
+* **config:** Call debug log methods after setting the loglevel based upon config/cli-options. ([a340dae](https://github.com/karma-runner/karma/commit/a340dae))
+* **config:** Retry install with appveyor-retry.   ([17d5791](https://github.com/karma-runner/karma/commit/17d5791))
+* **config:** Workaround npm 5.4 windows bug ([ec47d81](https://github.com/karma-runner/karma/commit/ec47d81))
+* **deps:** update socket.io to version 2.0.3. ([3b7b019](https://github.com/karma-runner/karma/commit/3b7b019)), closes [#2821](https://github.com/karma-runner/karma/issues/2821) [#2777](https://github.com/karma-runner/karma/issues/2777)
+* **logging:** Upgrade to log4js 2.x API. ([#2868](https://github.com/karma-runner/karma/issues/2868)) ([f6f8707](https://github.com/karma-runner/karma/commit/f6f8707)), closes [#2858](https://github.com/karma-runner/karma/issues/2858)
+* **reporter:** show file path correctly when urlRoot specified ([34dc7d3](https://github.com/karma-runner/karma/commit/34dc7d3)), closes [#2897](https://github.com/karma-runner/karma/issues/2897)
+
+
+### Features
+
+* **cli:** Warn on commands with underscores. ([0801a7f](https://github.com/karma-runner/karma/commit/0801a7f))
+* **config:** allow to use newer versions of CoffeeScript ([c1fcf42](https://github.com/karma-runner/karma/commit/c1fcf42))
+* **launcher:** trim whitespace in browser name ([871d46f](https://github.com/karma-runner/karma/commit/871d46f))
+* **launcher:** trim whitespace in browser name ([334f9fb](https://github.com/karma-runner/karma/commit/334f9fb))
+* **middleware:** added manual file type option ([0330cd1](https://github.com/karma-runner/karma/commit/0330cd1)), closes [#2824](https://github.com/karma-runner/karma/issues/2824)
+* better string representation of errors ([c9e1ca9](https://github.com/karma-runner/karma/commit/c9e1ca9))
+* drop core-js and babel where possible ([60dfc5c](https://github.com/karma-runner/karma/commit/60dfc5c))
+* update of supported node versions ([e79463b](https://github.com/karma-runner/karma/commit/e79463b))
+
+
+
+<a name="1.7.1"></a>
+## [1.7.1](https://github.com/karma-runner/karma/compare/v1.7.0...1.7.1) (2017-08-25)
+
+
+### Bug Fixes
+
+* **debug-runner:** support asynchronous tests in the debug runner ([a36f3eb](https://github.com/karma-runner/karma/commit/a36f3eb)), closes [#2811](https://github.com/karma-runner/karma/issues/2811)
+* **file-list:** Stop polluting global environment with core-js ([0988022](https://github.com/karma-runner/karma/commit/0988022))
+* **preprocessor:** renamed handeFile to readFileCallback ([92a8c81](https://github.com/karma-runner/karma/commit/92a8c81))
+* **preprocessor:** retry if fs.readFile fails ([4b60513](https://github.com/karma-runner/karma/commit/4b60513))
+* **preprocessor:** throw if retry fails ([2789bf5](https://github.com/karma-runner/karma/commit/2789bf5))
+
+
+### Features
+
+* **ci:** disable testing of node versions below 4 ([ec92ea9](https://github.com/karma-runner/karma/commit/ec92ea9))
+* **client:** log global error stack trace  ([523d608](https://github.com/karma-runner/karma/commit/523d608)), closes [#2812](https://github.com/karma-runner/karma/issues/2812)
+* **config:** remove polling usage ([b0f41c7](https://github.com/karma-runner/karma/commit/b0f41c7)), closes [#2669](https://github.com/karma-runner/karma/issues/2669)
+* **deps:** add support for node@8 ([7feaee3](https://github.com/karma-runner/karma/commit/7feaee3)), closes [#2754](https://github.com/karma-runner/karma/issues/2754)
+* **deps:** update socket.io to `1.7.4` to avoid issue with `ws@1.1.2` ([264442b](https://github.com/karma-runner/karma/commit/264442b)), closes [#2593](https://github.com/karma-runner/karma/issues/2593)
+* **watcher:** Debounce autoWatchBatchDelay ([2f8c049](https://github.com/karma-runner/karma/commit/2f8c049)), closes [#2331](https://github.com/karma-runner/karma/issues/2331)
+
+
+
+<a name="1.7.1"></a>
+## [1.7.1](https://github.com/karma-runner/karma/compare/v1.7.0...v1.7.1) (2017-08-30)
+
+
+### Features
+
+* **deps:** add support for node[@8](https://github.com/8) ([ea32194](https://github.com/karma-runner/karma/commit/ea32194)), closes [#2754](https://github.com/karma-runner/karma/issues/2754)
+
+
+
+<a name="1.7.0"></a>
+# [1.7.0](https://github.com/karma-runner/karma/compare/v1.6.0...v1.7.0) (2017-05-06)
+
+
+### Bug Fixes
+
+* **middleware:** change to use vanilla for loop ([ac62cc0](https://github.com/karma-runner/karma/commit/ac62cc0)), closes [#2671](https://github.com/karma-runner/karma/issues/2671)
+* **reporters:** Revert the backwards-incompatible log priority order changes ([316b944](https://github.com/karma-runner/karma/commit/316b944)), closes [#2582](https://github.com/karma-runner/karma/issues/2582)
+
+
+### Features
+
+* **runner:** Buffer stdout and stderr for output when errors occur ([460d423](https://github.com/karma-runner/karma/commit/460d423))
+
+
+
+<a name="1.6.0"></a>
+# [1.6.0](https://github.com/karma-runner/karma/compare/v1.5.0...v1.6.0) (2017-04-05)
+
+
+### Bug Fixes
+
+* **client:** add proxy support to stringify ([be10116](https://github.com/karma-runner/karma/commit/be10116))
+* **file-list:** always use file from first matcher ([74bfdf3](https://github.com/karma-runner/karma/commit/74bfdf3))
+* **middleware:** does not work with mootools ([#2591](https://github.com/karma-runner/karma/issues/2591)) ([2685e13](https://github.com/karma-runner/karma/commit/2685e13))
+* **reporter:** keep users exact formatError result ([17c2c43](https://github.com/karma-runner/karma/commit/17c2c43))
+
+
+### Features
+
+* **browser:** add browser_info event ([09ac7d7](https://github.com/karma-runner/karma/commit/09ac7d7)), closes [#2192](https://github.com/karma-runner/karma/issues/2192)
+* **launcher:** output stderr for failing launchers ([7d33398](https://github.com/karma-runner/karma/commit/7d33398))
+* **proxy:** add proxy events to config  ([f5d99fb](https://github.com/karma-runner/karma/commit/f5d99fb))
+
+
+
+<a name="1.5.0"></a>
+# [1.5.0](https://github.com/karma-runner/karma/compare/v1.4.1...v1.5.0) (2017-02-20)
+
+
+### Bug Fixes
+
+* filter browser logging by level of LOG ([89a7a1c](https://github.com/karma-runner/karma/commit/89a7a1c)), closes [#2228](https://github.com/karma-runner/karma/issues/2228)
+* make window.parent.karma available in debugged context ([3e7eaeb](https://github.com/karma-runner/karma/commit/3e7eaeb))
+* **client:** don't crash if receive array-like results ([e095411](https://github.com/karma-runner/karma/commit/e095411)), closes [#2061](https://github.com/karma-runner/karma/issues/2061)
+
+
+### Features
+
+* add an option to run the tests by dynamically loading test scripts without iframe ([aa42c41](https://github.com/karma-runner/karma/commit/aa42c41))
+* add support for node[@7](https://github.com/7) ([eb407ab](https://github.com/karma-runner/karma/commit/eb407ab)), closes [#2559](https://github.com/karma-runner/karma/issues/2559)
+
+
+
+<a name="1.4.1"></a>
+## [1.4.1](https://github.com/karma-runner/karma/compare/v1.4.0...v1.4.1) (2017-01-29)
+
+
+### Bug Fixes
+
+* **runner:** Make process kill timeout configurable ([ffaa054](https://github.com/karma-runner/karma/commit/ffaa054)), closes [#2447](https://github.com/karma-runner/karma/issues/2447)
+* **runner:** Make process kill timeout configurable - Fix Build ([a128e5c](https://github.com/karma-runner/karma/commit/a128e5c)), closes [#2447](https://github.com/karma-runner/karma/issues/2447)
+* **runner:** Test process kill timeout config ([99a1d48](https://github.com/karma-runner/karma/commit/99a1d48)), closes [#2447](https://github.com/karma-runner/karma/issues/2447)
+
+
+### Features
+
+* **config:** allow config to be a default export ([9976dce](https://github.com/karma-runner/karma/commit/9976dce))
+
+
+
+<a name="1.4.0"></a>
+# [1.4.0](https://github.com/karma-runner/karma/compare/v1.3.0...v1.4.0) (2017-01-14)
+
+
+### Bug Fixes
+
+* **browser:** filter browser logging by level  ([35965d9](https://github.com/karma-runner/karma/commit/35965d9)), closes [#2228](https://github.com/karma-runner/karma/issues/2228)
+* **cli:** restore shell completion in the npm package ([f56b5a5](https://github.com/karma-runner/karma/commit/f56b5a5)), closes [#2351](https://github.com/karma-runner/karma/issues/2351)
+* **config:** add crossOriginAttribute config option ([1e465b1](https://github.com/karma-runner/karma/commit/1e465b1))
+* **middleware:** update `Buffer` usage ([3d94b8c](https://github.com/karma-runner/karma/commit/3d94b8c))
+* **reporter:** do not allow URL domains to span new lines ([2c13404](https://github.com/karma-runner/karma/commit/2c13404))
+* **reporter:** strip only hostname/port ([fbbeccf](https://github.com/karma-runner/karma/commit/fbbeccf)), closes [#2209](https://github.com/karma-runner/karma/issues/2209)
+* **reporters:**  cannot read property map of undefined  ([305df2c](https://github.com/karma-runner/karma/commit/305df2c)), closes [#1662](https://github.com/karma-runner/karma/issues/1662)
+* **server:** exit with code 1 when failing due to missing browser ([86e2ef2](https://github.com/karma-runner/karma/commit/86e2ef2)), closes [#2403](https://github.com/karma-runner/karma/issues/2403)
+
+
+### Features
+
+* **api:** add constants to the public api ([ee10977](https://github.com/karma-runner/karma/commit/ee10977)), closes [#2361](https://github.com/karma-runner/karma/issues/2361)
+* **api:** expose `config.parseConfig` on the public api ([7d2c1ae](https://github.com/karma-runner/karma/commit/7d2c1ae))
+* **client:** capture confirm & prompt  ([3a618b3](https://github.com/karma-runner/karma/commit/3a618b3)), closes [#694](https://github.com/karma-runner/karma/issues/694)
+* **server:** add listen address option so that IPv6 and loopback interfaces can be used ([8e5bee6](https://github.com/karma-runner/karma/commit/8e5bee6)), closes [#2477](https://github.com/karma-runner/karma/issues/2477)
+* **web-server:** allow overriding of default http module ([1e7514d](https://github.com/karma-runner/karma/commit/1e7514d)), closes [#2424](https://github.com/karma-runner/karma/issues/2424)
+
+
+
 <a name="1.3.0"></a>
 # [1.3.0](https://github.com/karma-runner/karma/compare/v1.2.0...v1.3.0) (2016-09-09)
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -16,7 +16,7 @@ submitting an issue to our [GitHub Repository][github_newissue]. Even better you
 with a fix.
 
 **Working on your first Pull Request?** You can learn how from this *free* series
-[How to Contribute to an Open Source Project on GitHub](egghead_series)
+[How to Contribute to an Open Source Project on GitHub][egghead_series]
 
 [docs_contributing]: http://karma-runner.github.io/0.13/dev/contributing.html
 [gitter]: https://gitter.im/karma-runner/karma

diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ _real_ browsers.
 ## But I still want to use \_insert testing library\_
 
 Karma is not a testing framework, nor an assertion library.
-Karma just launches a HTTP server, and generates the test runner HTML file you probably already know from your favourite testing framework.
+Karma just launches an HTTP server, and generates the test runner HTML file you probably already know from your favourite testing framework.
 So for testing purposes you can use pretty much anything you like. There are already plugins for most of the common testing frameworks:
 
 * [Jasmine]

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,10 +2,9 @@ version: "{build}"
 
 environment:
   matrix:
-    - nodejs_version: "0.12"
     - nodejs_version: "4"
-    - nodejs_version: "5"
     - nodejs_version: "6"
+    - nodejs_version: "8"
 
 matrix:
   fast_finish: true
@@ -22,7 +21,7 @@ install:
   - npm --version
 
   # Install our package dependencies
-  - npm install
+  - appveyor-retry npm install
 
   # Install our current directory as a dependency of itself
   - npm run init:windows

diff --git a/client/karma.js b/client/karma.js
@@ -49,12 +49,31 @@ var Karma = function (socket, iframe, opener, navigator, location) {
   var childWindow = null
   var navigateContextTo = function (url) {
     if (self.config.useIframe === false) {
-      // If there is a window already open, then close it
-      // DEV: In some environments (e.g. Electron), we don't have setter access for location
-      if (childWindow !== null && childWindow.closed !== true) {
-        childWindow.close()
+      // run in new window
+      if (self.config.runInParent === false) {
+        // If there is a window already open, then close it
+        // DEV: In some environments (e.g. Electron), we don't have setter access for location
+        if (childWindow !== null && childWindow.closed !== true) {
+          childWindow.close()
+        }
+        childWindow = opener(url)
+      // run context on parent element and dynamically loading scripts
+      } else if (url !== 'about:blank') {
+        var loadScript = function (idx) {
+          if (idx < window.__karma__.scriptUrls.length) {
+            var ele = document.createElement('script')
+            ele.src = window.__karma__.scriptUrls[idx]
+            ele.onload = function () {
+              loadScript(idx + 1)
+            }
+            document.body.appendChild(ele)
+          } else {
+            window.__karma__.loaded()
+          }
+        }
+        loadScript(0)
       }
-      childWindow = opener(url)
+    // run in iframe
     } else {
       iframe.src = url
     }
@@ -85,31 +104,73 @@ var Karma = function (socket, iframe, opener, navigator, location) {
     navigateContextTo('about:blank')
   }
 
+  function getLocation (url, lineno, colno) {
+    var location = ''
+
+    if (url !== undefined) {
+      location += url
+    }
+
+    if (lineno !== undefined) {
+      location += ':' + lineno
+    }
+
+    if (colno !== undefined) {
+      location += ':' + colno
+    }
+
+    return location
+  }
+
   // error during js file loading (most likely syntax error)
-  // we are not going to execute at all
-  this.error = function (msg, url, line) {
-    var message = msg
+  // we are not going to execute at all. `window.onerror` callback.
+  this.error = function (messageOrEvent, source, lineno, colno, error) {
+    var message = messageOrEvent
+    var location = getLocation(source, lineno, colno)
+
+    if (location !== '') {
+      message += '\nat ' + location
+    }
 
-    if (url) {
-      message = msg + '\nat ' + url + (line ? ':' + line : '')
+    if (error) {
+      message += '\n\n' + error.stack
     }
 
+    // create an object with the string representation of the message to ensure all its content is properly
+    // transferred to the console log
+    message = {message: message, str: message.toString()}
+
     socket.emit('karma_error', message)
     this.complete()
     return false
   }
 
-  this.result = function (result) {
+  this.result = function (originalResult) {
+    var convertedResult = {}
+
+    // Convert all array-like objects to real arrays.
+    for (var propertyName in originalResult) {
+      if (originalResult.hasOwnProperty(propertyName)) {
+        var propertyValue = originalResult[propertyName]
+
+        if (Object.prototype.toString.call(propertyValue) === '[object Array]') {
+          convertedResult[propertyName] = Array.prototype.slice.call(propertyValue)
+        } else {
+          convertedResult[propertyName] = propertyValue
+        }
+      }
+    }
+
     if (!startEmitted) {
       socket.emit('start', {total: null})
       startEmitted = true
     }
 
     if (resultsBufferLimit === 1) {
-      return socket.emit('result', result)
+      return socket.emit('result', convertedResult)
     }
 
-    resultsBuffer.push(result)
+    resultsBuffer.push(convertedResult)
 
     if (resultsBuffer.length === resultsBufferLimit) {
       socket.emit('result', resultsBuffer)