Merge pull request #108 from patocallaghan/fix_config_build

Allow to add custom build string

Author: nakula

README.md

@@ -29,6 +29,7 @@ To run browser tests on BrowserStack infrastructure, you need to create a `brows
  * `test_framework`: Specify test framework which will run the tests. Currently supporting qunit, jasmine, jasmine2 and mocha.
  * `timeout`: Specify worker timeout with BrowserStack.
  * `browsers`: A list of browsers on which tests are to be run. Find a [list of all supported browsers and platforms on browerstack.com](http://www.browserstack.com/list-of-browsers-and-platforms?product=live).
+ * `build`: A string to identify your test run in Browserstack.  In `TRAVIS` setup `TRAVIS_COMMIT` will be the default identifier.
  * `proxy`: Specify a proxy to use for the local tunnel. Object with `host`, `port`, `username` and `password` properties.
 
 A sample configuration file:

lib/config.js

@@ -47,10 +47,8 @@ if (!config.project) {
 
 var commit_id = process.env.TRAVIS_COMMIT;
 
-if (commit_id) {
-  config.build = 'Commit-' + commit_id.slice(0, commit_id.length / 2);
-} {
-  config.build = 'Local run, ' + new Date().toISOString();
+if(!config.build) {
+  config.build = commit_id ? 'Commit-' + commit_id.slice(0, commit_id.length / 2) : 'Local run, ' + new Date().toISOString();
 }
 
 ['username', 'key', 'browsers', 'test_path'].forEach(function(param) {