Merge pull request #103 from Dakuan/accept-config-object

string or object for config
jestjs · Aug 5, 2014 · ab3d966 · ab3d966
2 parents dee24b0 + 1431c58
commit ab3d966
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/bin/jest.js b/bin/jest.js
@@ -139,7 +139,11 @@ function runCLI(argv, packageRoot, onComplete) {
 
   var config;
   if (argv.config) {
-    config = utils.loadConfigFromFile(argv.config);
+    if (typeof argv.config === 'string') {    
+      config = utils.loadConfigFromFile(argv.config);
+    } else if (typeof argv.config === 'object') {    
+      config = Q(utils.normalizeConfig(argv.config));
+    }
   } else {
     var pkgJsonPath = path.join(packageRoot, 'package.json');
     var pkgJson = fs.existsSync(pkgJsonPath) ? require(pkgJsonPath) : {};