fix(config): Check if configFilePath is a string.

Fixes #447.
karma-runner · Apr 1, 2013 · 98724b6 · 98724b6
1 parent bfd76b9
commit 98724b6
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/lib/config.js b/lib/config.js
@@ -188,7 +188,7 @@ var readConfigFile = function(filepath) {
 
 var parseConfig = function(configFilePath, cliOptions) {
 
- var configFromFile = configFilePath ? readConfigFile(configFilePath) : {};
+ var configFromFile = helper.isString(configFilePath) ? readConfigFile(configFilePath) : {};
 
  // default config
  var config = {
@@ -236,11 +236,13 @@ var parseConfig = function(configFilePath, cliOptions) {
  }
  });
 
- // resolve basePath
- config.basePath = path.resolve(path.dirname(configFilePath), config.basePath);
+ if (helper.isString(configFilePath)) {
+ // resolve basePath
+ config.basePath = path.resolve(path.dirname(configFilePath), config.basePath);
 
- // always ignore the config file itself
- config.exclude.push(configFilePath);
+ // always ignore the config file itself
+ config.exclude.push(configFilePath);
+ }
 
  return normalizeConfig(config);
 };