Merge pull request #2552 from sebv/master

Added functional/common dir to ci.

bin/test.sh

@@ -59,7 +59,8 @@ run_ios_tests() {
     echo 
     DEVICE=$2 time $appium_mocha -g $3 -i \
         test/functional/common \
-        test/functional/ios
+        test/functional/ios \
+        test/functional/gappium
 }
 
 if $ios6_only || $ios_only || $all_tests; then
@@ -101,5 +102,5 @@ if $selendroid_only || $all_tests; then
     echo "---------------------"
     DEVICE=selendroid time $appium_mocha -g  '@skip-selendroid-all' -i \
         test/functional/selendroid \
-        test/functional/common/gappium-specs.js
+        test/functional/gappium
 fi

ci/script.sh

@@ -13,7 +13,8 @@ elif [[ $CI_CONFIG == 'build_ios' ]]; then
     ./reset.sh --hardcore --no-npmlink --dev --ios --verbose
     if [[ $TRAVIS_SECURE_ENV_VARS == true ]]; then
         ./ci/upload_build_to_sauce.sh
-        GLOB_PATTERNS='test/functional/ios/**/*-specs.js'
+        GLOB_PATTERNS='test/functional/common/**/*-specs.js'
+        GLOB_PATTERNS+=',test/functional/ios/**/*-specs.js'
         node ci/tools/testfiles-tool.js split "${GLOB_PATTERNS}" > ci/test-split.json
         BRANCH_CAT=ios ./ci/git-push.sh
     fi

test/functional/common/jsonwp-specs.js

@@ -5,7 +5,9 @@ var chai = require('chai')
   , serverHub = serverUrl + '/wd/hub/session'
   , request = require('request');
 
-describe("appium - jsonwp -", function () {
+describe("common - jsonwp @skip-ci", function () {
+  // TODO: This cannot be tested using Sauce. It need to be run within a Travis 
+  // instance.
   describe('to a non-existent url', function () {
     it('should get 404 with text/plain body', function (done) {
       request.get(serverUrl + '/a/bad/path', function (err, res, body) {

test/functional/common/prelaunch-specs.js

@@ -46,7 +46,9 @@ var waitForLaunch = function (app, extraArgs, done) {
   return proc;
 };
 
-describe("appium - prelaunch -", function () {
+describe("common - prelaunch @skip-ci", function () {
+  // TODO: test helpers need to be modified to cope prelaunch on sauce.
+  // leaving it out for now.
   this.timeout(env.MOCHA_INIT_TIMEOUT);
   describe('ios @skip-android-all', function () {
     var proc;