Merge pull request meteor#6472 from aldeed/fix-test-driver-error-logic

Tom Coleman · Tom Coleman · commit 889ea6a8e12c · 2016-03-15T09:38:41.000+11:00
Fix logic for showing --driver-package error
diff --git a/packages/meteor/test_environment.js b/packages/meteor/test_environment.js
@@ -13,12 +13,8 @@ Meteor.isTest = !!TEST_METADATA.isTest;
 Meteor.isAppTest = !!TEST_METADATA.isAppTest;
 
 var testDriverPackageName = TEST_METADATA.driverPackage;
-if (testDriverPackageName) {
+if (typeof testDriverPackageName === "string") {
   Meteor.startup(function() {
-    if (typeof testDriverPackageName !== "string") {
-      throw new Error("No --driver-package specified for `meteor test`");
-    }
-
     var testDriverPackage = Package[testDriverPackageName];
     if (! testDriverPackage) {
       throw new Error("Can't find test driver package: " + testDriverPackageName);
@@ -30,7 +26,7 @@ if (testDriverPackageName) {
         throw new Error("Test driver package " + testDriverPackageName
           + " missing `runTests` export");
       }
-      testDriverPackage.runTests();  
+      testDriverPackage.runTests();
     } else {
       // The server can optionally define `start`
       if (typeof testDriverPackage.start === "function") {
