Merge branch 'master' into allow-multiple-tags

# Conflicts:
#	index.js

Author: Lee Eggebroten

README.MD

@@ -9,6 +9,7 @@ JavaScript browser automation framework using official [selenium-webdriver](http
 * [Installation](#installation)
 * [Usage](#usage)
   * [Options](#options)
+    * [Configuration file](#configuration-file)
   * [Feature files](#feature-files)
   * [Step definitions](#step-definitions)
   * [Page objects](#page-objects)
@@ -61,6 +62,33 @@ By default tests are run using Google Chrome, to run tests using another browser
 | Firefox    | `-b firefox`
 | Phantom JS | `-b phantomjs`
 
+#### Configuration file
+
+Configuration options can be set using a `selenium-cucumber-js.json` file at the root of your project. The JSON keys use the "long name" from the command line options. For example the following duplicates default configuration:
+
+```json
+{
+    "steps": "./step-definitions",
+    "pageObjects": "./page-objects",
+    "sharedObjects": "./shared-objects",
+    "reports": "./reports",
+    "browser": "chrome",
+    "timeout": 10000
+}
+```
+
+Whereas the following would set configuration to match the expected directory structure of IntelliJ's Cucumber plugin, and make default timeout one minute. _Note that the default browser has not been overridden and will remain 'chrome'._
+
+```json
+{
+    "steps": "./features/step_definitions",
+    "pageObjects": "./features/page_objects",
+    "sharedObjects": "./features/shared_objects",
+    "reports": "./features/reports",
+    "timeout": 60000
+}
+```
+
 ### Feature files
 
 A feature file is a [Business Readable, Domain Specific Language](http://martinfowler.com/bliki/BusinessReadableDSL.html) file that lets you describe software’s behavior without detailing how that behavior is implemented. Feature files are written using the [Gherkin syntax](https://github.com/cucumber/cucumber/wiki/Gherkin) and must live in a folder named **features** within the root of your project.
@@ -338,4 +366,4 @@ node ./node_modules/selenium-cucumber-js/index.js -s ./features/step_definitions
 
 ## License
 
-Licensed under [ISC License](LICENSE) © [John Doherty](http://www.johndoherty.info)
+Licensed under [ISC License](LICENSE) © [John Doherty](http://www.johndoherty.info)

index.js

@@ -23,11 +23,11 @@ function coerceInt(value, defaultValue) {
 }
 
 var config = {
-    step_def_dir: './step-definitions',
-    page_obj_dir: './page-objects',
-    shared_obj_dir: './shared-objects',
-    reports_dir: './reports',
-    default_browser: 'chrome',
+    steps: './step-definitions',
+    pageObjects: './page-objects',
+    sharedObjects: './shared-objects',
+    reports: './reports',
+    browser: 'chrome',
     timeout: 10000
 };
 
@@ -40,13 +40,13 @@ if (fs.isFileSync(configFileName)) {
 program
     .version(pjson.version)
     .description(pjson.description)
-    .option('-s, --steps <path>', 'path to step definitions. defaults to ' + config.step_def_dir, config.step_def_dir)
-    .option('-p, --pageObjects <path>', 'path to page objects. defaults to ' + config.page_obj_dir, config.page_obj_dir)
-    .option('-o, --sharedObjects [paths]', 'path to shared objects (repeatable). defaults to ' + config.shared_obj_dir, collectPaths, [config.shared_obj_dir])
-    .option('-b, --browser <path>', 'name of browser to use. defaults to ' + config.default_browser, config.default_browser)
-    .option('-r, --reports <path>', 'output path to save reports. defaults to ' + config.reports_dir, config.reports_dir)
+    .option('-s, --steps <path>', 'path to step definitions. defaults to ' + config.steps, config.steps)
+    .option('-p, --pageObjects <path>', 'path to page objects. defaults to ' + config.pageObjects, config.pageObjects)
+    .option('-o, --sharedObjects [paths]', 'path to shared objects (repeatable). defaults to ' + config.sharedObjects, collectPaths, [config.sharedObjects])
+    .option('-b, --browser <path>', 'name of browser to use. defaults to ' + config.browser, config.browser)
+    .option('-r, --reports <path>', 'output path to save reports. defaults to ' + config.reports, config.reports)
     .option('-d, --disableLaunchReport [optional]', 'Disables the auto opening the browser with test report')
-    .option('-j, --junit <path>', 'output path to save junit-report.xml defaults to ' + config.reports_dir)
+    .option('-j, --junit <path>', 'output path to save junit-report.xml defaults to ' + config.reports)
     .option('-t, --tags <tagName>', 'name of tag to run', collectPaths, [])
     .option('-f, --featureFile <path>', 'a specific feature file to run')
     .option('-x, --timeOut <n>', 'steps definition timeout in milliseconds. defaults to ' + config.timeout, coerceInt, config.timeout)