Merge pull request appium#3319 from moizjv/documentation

Fixing reset.bat and adding additional documentation running tests on windows

CONTRIBUTING.md

@@ -151,7 +151,12 @@ Mocha, for example:
 
 Or individual tests (e.g., a test with the word "alert" in the name):
 
-    DEVICE=ios6 mocha -t 60000 -R spec --grep "alert" test/functional/ios/apidemos
+    DEVICE=ios6 mocha -t 60000 -R spec --grep "alert" test/functional/ios/uicatalog
+
+For windows you have to use `set DEVICE=android` in cmd to run above tests, for example:
+
+    set DEVICE=android
+    mocha -t 60000 -R spec test/functional/android/apidemos/alerts-specs.js
 
 NOTE: For Android, you will need an emulator/device with screen size of 4.0"
 (480x800). Some tests might fail on a different screen size.

grunt-helpers.js

@@ -374,6 +374,9 @@ var buildAndroidProj = function (grunt, projPath, target, cb) {
     } else {
       if (stdout) {
         var cmd = stdout.split('\r\n')[0].trim();
+        if (isWindows && cmdName === 'ant') {
+          cmd = cmd + '.bat';
+        }
         grunt.log.write("Using " + cmdName + " found at " + cmd + "\n");
         var proc = spawn(cmd, [target], {cwd: projPath});
         proc.on("error", function () {