From 71853f765a5d5d4d4e2e33a29d4e3b354ecd8a90 Mon Sep 17 00:00:00 2001
From: Dakuan <dom.barker808@gmail.com>
Date: Mon, 4 Aug 2014 11:34:21 +0100
Subject: [PATCH 1/2] string or object

---
 bin/jest.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/jest.js b/bin/jest.js
index c721ad32d503..bcc72f214c7f 100755
--- 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 (argv.config instanceof String) {
+      config = utils.loadConfigFromFile(argv.config);
+    } else if (argv.config instanceof Object) {
+      config = Q(utils.normalizeConfig(argv.config));
+    }
   } else {
     var pkgJsonPath = path.join(packageRoot, 'package.json');
     var pkgJson = fs.existsSync(pkgJsonPath) ? require(pkgJsonPath) : {};

From 1431c5818a87696c5be53f92c4f1d9cc7e03a326 Mon Sep 17 00:00:00 2001
From: Dakuan <dom.barker808@gmail.com>
Date: Mon, 4 Aug 2014 19:34:08 +0100
Subject: [PATCH 2/2] use typeof instead of instanceof

---
 bin/jest.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/jest.js b/bin/jest.js
index bcc72f214c7f..4189e43c6e5b 100755
--- a/bin/jest.js
+++ b/bin/jest.js
@@ -139,9 +139,9 @@ function runCLI(argv, packageRoot, onComplete) {
 
   var config;
   if (argv.config) {
-    if (argv.config instanceof String) {
+    if (typeof argv.config === 'string') {    
       config = utils.loadConfigFromFile(argv.config);
-    } else if (argv.config instanceof Object) {
+    } else if (typeof argv.config === 'object') {    
       config = Q(utils.normalizeConfig(argv.config));
     }
   } else {