Merge pull request #4 from aashwin/patch-1

Update world.js to check for user-defined global.DEFAULT_TIMEOUT before setting default

Author: John Doherty

runtime/world.js

@@ -18,9 +18,9 @@ var fs = require('fs-plus'),
     assert = require("chai").assert,
     reporter = require('cucumber-html-reporter'),
     cucumberJunit = require('cucumber-junit');
-
-global.DEFAULT_TIMEOUT = 10 * 1000; // 10 second default
-
+if(!global.DEFAULT_TIMEOUT){
+    global.DEFAULT_TIMEOUT = 10 * 1000; // 10 second default
+}
 /**
  * create the selenium browser based on global var set in index.js
  */
@@ -205,4 +205,4 @@ module.exports = function () {
             });
         }
     });
-};
+};