test(modules): ensure relative paths work correctly

.mailmap

@@ -1,3 +1,4 @@
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
+Michał Gołębiowski-Owczarek <[email protected]>

.travis.yml

@@ -1,11 +1,10 @@
 sudo: false
 language: node_js
 node_js:
-  - "0.10"
-  - "0.12"
   - 4
-  - 5
-  - 7
+  - 6
+  - 8
+  - 9
 
 env:
   global:
@@ -15,13 +14,13 @@ env:
 matrix:
   fast_finish: true
   include:
-    - node_js: "6"
+    - 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:
@@ -37,7 +36,7 @@ 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 npm run travis; else ./scripts/validate-commit-msg.sh $TRAVIS_COMMIT; fi'
+  - 'if [ "$VALIDATE_COMMIT_MSG" == "true" ]; then ./scripts/validate-commit-msg.sh $TRAVIS_COMMIT; fi'
   - 'if [ "$LINT" == "true" ]; then npm run lint; fi'
 
 script:

CHANGELOG.md

@@ -1,3 +1,29 @@
+<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)
 

appveyor.yml

@@ -2,11 +2,9 @@ version: "{build}"
 
 environment:
   matrix:
-    - nodejs_version: "0.12"
     - nodejs_version: "4"
-    - nodejs_version: "5"
     - nodejs_version: "6"
-    - nodejs_version: "7"
+    - nodejs_version: "8"
 
 matrix:
   fast_finish: true
@@ -23,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

client/karma.js

@@ -104,15 +104,42 @@ 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 (url) {
-      message = msg + '\nat ' + url + (line ? ':' + line : '')
+    if (location !== '') {
+      message += '\nat ' + location
     }
 
+    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

config.tpl.coffee

@@ -18,7 +18,7 @@ module.exports = (config) ->
     ]
 
 
-    # list of files to exclude
+    # list of files / patterns to exclude
     exclude: [%EXCLUDE%
     ]
 

config.tpl.js

@@ -18,7 +18,7 @@ module.exports = function(config) {
     ],
 
 
-    // list of files to exclude
+    // list of files / patterns to exclude
     exclude: [%EXCLUDE%
     ],
 

config.tpl.ls

@@ -18,7 +18,7 @@ module.exports = (config) ->
     ]
 
 
-    # list of files to exclude
+    # list of files / patterns to exclude
     exclude: [%EXCLUDE%
     ]
 

config.tpl.ts

@@ -18,7 +18,7 @@ module.exports = (config) => {
     ],
 
 
-    // list of files to exclude
+    // list of files / patterns to exclude
     exclude: [%EXCLUDE%
     ],
 

docs/config/01-configuration-file.md

@@ -89,8 +89,9 @@ These are all of the available configuration options.
 
 **Description:** When Karma is watching the files for changes, it tries to batch
 multiple changes into a single run so that the test runner doesn't try to start and restart running
-tests more than it should. The configuration setting tells Karma how long to wait (in milliseconds) after any changes
-have occurred before starting the test process again.
+tests more than it should, or restart while build files are not in a consistent state. The configuration setting
+tells Karma how long to wait (in milliseconds) from the last file change before starting
+the test process again, resetting the timer each time a file changes (i.e. [debouncing](https://davidwalsh.name/javascript-debounce-function)).
 
 
 ## basePath
@@ -521,6 +522,8 @@ See [plugins] for more information.
 
 **Description:** The port where the web server will be listening.
 
+If the defined port is already in use, karma will automatically increase its value in steps of 1 until a free port is found.
+
 
 ## processKillTimeout
 **Type:** Number

docs/config/02-files.md

@@ -24,6 +24,17 @@ Each pattern is either a simple string or an object with four properties:
 * **No Default.**
 * **Description.** The pattern to use for matching. This property is mandatory.
 
+### `type`
+* **Type.** String
+* **Default.** Will attempt to determine type based on file extension. If that fails, defaults to `js`.
+* **Description.** Choose the type to use when including a file.
+* **Possible Values:**
+  * `css`
+  * `html`
+  * `js`
+  * `dart`
+  * `module`
+
 ### `watched`
 * **Type.** Boolean
 * **Default.** `true`

docs/dev/02-making-changes.md

@@ -9,6 +9,7 @@ TODO:
 
 If you are thinking about making Karma better, or you just want to hack on it, that’s great!
 Here are some tips on how to set up a Karma workspace and how to send a good pull request.
+**Please note we enforce [commit message conventions].**
 
 ## Setting up the Workspace
 

docs/intro/01-installation.md

@@ -5,7 +5,7 @@ Karma runs on [Node.js] and is available as an [NPM] package.
 On Mac or Linux we recommend using [NVM](https://github.com/creationix/nvm). On Windows, download Node.js
 from [the official site](https://nodejs.org/) or use the [NVM PowerShell Module](https://www.powershellgallery.com/packages/nvm).
 
-Note: Karma currently works on Node.js **0.10**, **0.12.x**, **4.x**, **5.x**, **6.x**, and **7.x**. See [FAQ] for more info.
+Note: Karma currently works on Node.js **4.x**, **5.x**, **6.x**, **7.x**, and **8.x**. See [FAQ] for more info.
 
 ## Installing Karma and plugins
 

docs/intro/04-faq.md

@@ -25,7 +25,7 @@ The latest stable version from NPM (`npm install karma`). See [versioning] for m
 
 
 ### Which version of Node.js does Karma run with?
-Karma works on all LTS versions node in active maintenance state (see [LTS docs](https://github.com/nodejs/LTS/blob/master/README.md) for more info) as well as the latest stable version. That is **0.12.x**, **4.x**, **5.x** and **6.x** at this point. Additionally, Node **0.10** is currently supported.
+Karma works on all LTS versions node in active maintenance state (see [LTS docs](https://github.com/nodejs/LTS/blob/master/README.md) for more info) as well as the latest stable version. That is **4.x**, **5.x**, **6.x**, and **8.x** at this point.
 
 
 [mailing list]: https://groups.google.com/d/forum/karma-users

gruntfile.js

@@ -31,7 +31,6 @@ module.exports = function (grunt) {
     },
     mochaTest: {
       options: {
-        require: 'babel-register',
         reporter: 'dot',
         ui: 'bdd',
         quiet: false,
@@ -46,9 +45,9 @@ module.exports = function (grunt) {
     },
     cucumberjs: {
       options: {
-        steps: 'test/e2e/steps',
+        steps: 'test/e2e/step_definitions',
         format: 'progress',
-        require: 'test/e2e/support/env.js'
+        require: ['test/e2e/support/env.js', 'test/e2e/support/world.js']
       },
       all: 'test/e2e/*.feature',
       current: {
@@ -64,7 +63,7 @@ module.exports = function (grunt) {
           src: 'test/e2e/*.feature'
         },
         options: {
-          tags: '~@not-jenkins'
+          tags: 'not @not-jenkins'
         }
       }
     },
@@ -135,8 +134,9 @@ module.exports = function (grunt) {
   grunt.loadTasks('tasks')
   require('load-grunt-tasks')(grunt)
 
+  grunt.registerTask('lint', ['eslint'])
   grunt.registerTask('build', ['browserify:client'])
-  grunt.registerTask('default', ['build', 'test', 'lint'])
+  grunt.registerTask('default', ['build', 'lint', 'test'])
   grunt.registerTask('test-appveyor', ['test:unit', 'test:client'])
 
   grunt.registerTask('release', 'Build, bump and publish to NPM.', function (type) {

lib/cli.js

@@ -21,6 +21,9 @@ var processArgs = function (argv, options, fs, path) {
   Object.getOwnPropertyNames(argv).forEach(function (name) {
     var argumentValue = argv[name]
     if (name !== '_' && name !== '$0') {
+      if (name.indexOf('_') !== -1) {
+        throw new Error('Bad argument: ' + name + ' did you mean ' + name.replace('_', '-'))
+      }
       if (Array.isArray(argumentValue)) {
         // If the same argument is defined multiple times, override.
         argumentValue = argumentValue.pop()

lib/config.js

@@ -18,6 +18,12 @@ try {
   COFFEE_SCRIPT_AVAILABLE = true
 } catch (e) {}
 
+// CoffeeScript lost the hyphen in the module name a long time ago, all new version are named this:
+try {
+  require('coffeescript').register()
+  COFFEE_SCRIPT_AVAILABLE = true
+} catch (e) {}
+
 // LiveScript is required here to enable config files written in LiveScript.
 // It's not directly used in this file.
 try {
@@ -30,13 +36,14 @@ try {
   TYPE_SCRIPT_AVAILABLE = true
 } catch (e) {}
 
-var Pattern = function (pattern, served, included, watched, nocache) {
+var Pattern = function (pattern, served, included, watched, nocache, type) {
   this.pattern = pattern
   this.served = helper.isDefined(served) ? served : true
   this.included = helper.isDefined(included) ? included : true
   this.watched = helper.isDefined(watched) ? watched : true
   this.nocache = helper.isDefined(nocache) ? nocache : false
   this.weight = helper.mmPatternWeight(pattern)
+  this.type = type
 }
 
 Pattern.prototype.compare = function (other) {
@@ -61,7 +68,8 @@ var createPatternObject = function (pattern) {
           pattern.served,
           pattern.included,
           pattern.watched,
-          pattern.nocache)
+          pattern.nocache,
+          pattern.type)
     }
 
     log.warn('Invalid pattern %s!\n\tObject is missing "pattern" property.', pattern)
@@ -284,7 +292,7 @@ var Config = function () {
   this.LOG_DEBUG = constant.LOG_DEBUG
 
   this.set = function (newConfig) {
-    _.merge(config, newConfig, function (obj, src) {
+    _.mergeWith(config, newConfig, function (obj, src) {
       // Overwrite arrays to keep consistent with #283
       if (_.isArray(src)) {
         return src
@@ -315,7 +323,7 @@ var Config = function () {
   this.autoWatch = true
   this.autoWatchBatchDelay = 250
   this.restartOnFileChange = false
-  this.usePolling = process.platform === 'darwin' || process.platform === 'linux'
+  this.usePolling = process.platform === 'linux'
   this.reporters = ['progress']
   this.singleRun = false
   this.browsers = []
@@ -357,7 +365,6 @@ var CONFIG_SYNTAX_HELP = '  module.exports = function(config) {\n' +
 var parseConfig = function (configFilePath, cliOptions) {
   var configModule
   if (configFilePath) {
-    log.debug('Loading config %s', configFilePath)
 
     try {
       configModule = require(configFilePath)
@@ -389,7 +396,6 @@ var parseConfig = function (configFilePath, cliOptions) {
       return process.exit(1)
     }
   } else {
-    log.debug('No config file specified.')
     // if no config file path is passed, we define a dummy config module.
     configModule = function () {}
   }
@@ -433,6 +439,12 @@ var parseConfig = function (configFilePath, cliOptions) {
   // configure the logger as soon as we can
   logger.setup(config.logLevel, config.colors, config.loggers)
 
+  if (configFilePath) {
+    log.debug('Loading config %s', configFilePath)
+  } else {
+    log.debug('No config file specified.')
+  }
+
   return normalizeConfig(config, configFilePath)
 }