mirror/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-05-03 00:41:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

first android ci tests + fixes

Browse Source
This commit is contained in:
sebv
2014-05-15 17:08:47 +08:00
parent ddd5c6849c
commit d5ce534fab
18 changed files with 59 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci/git-push.sh
+1 -1
View File
@@ -10,7 +10,7 @@ git branch -f ${CI_BRANCH}
git checkout ${CI_BRANCH}
cp .travis.yml .travis.yml.master
node ci/tools/travis-yml-tool.js .travis.yml.master ci/travis-functional.yml > .travis.yml
git add ${UPLOAD_INFO_FILE} .travis.yml.master ci/test-split.json
git add .
git commit -a -m "ci ${BRANCH_CAT} branch for build #${TRAVIS_JOB_NUMBER}"
# pushing
ci/mochas/android-mocha
Executable
+10
View File
@@ -0,0 +1,10 @@
#!/bin/bash
SAUCE=1 \
VERBOSE=1 \
TARBALL="${TARBALL}" \
DEVICE="android" \
VERSION="4.3" \
./node_modules/.bin/mocha \
-g "@skip-ci|@skip-android-all" -i \
"$@"
ci/mochas/ios71-mocha
Executable
+10
View File
@@ -0,0 +1,10 @@
#!/bin/bash
SAUCE=1 \
VERBOSE=1 \
TARBALL="${TARBALL}" \
DEVICE="ios71" \
VERSION="7.1" \
./node_modules/.bin/mocha \
-g "@skip-ci|@skip-ios71|@skip-ios7|@skip-ios-all" -i \
"$@"
ci/script.sh
+12 -12
View File
@@ -16,14 +16,22 @@ elif [[ $CI_CONFIG == 'build_ios' ]]; then
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
cp ci/mochas/ios71-mocha ci/mocha
BRANCH_CAT=ios ./ci/git-push.sh
fi
elif [[ $CI_CONFIG == 'build_android' ]]; then
source ./ci/android_env
echo JAVA_HOME: $JAVA_HOME
./reset.sh --hardcore --no-npmlink --dev --android --verbose
#./ci/upload_build_to_sauce.sh
#BRANCH_CAT=android ./ci/git-push.sh
./reset.sh --hardcore --no-npmlink --dev --ios --android --verbose
if [[ $TRAVIS_SECURE_ENV_VARS == true ]]; then
rm sample-code/apps/ApiDemos
mv submodules/ApiDemos sample-code/apps/
./ci/upload_build_to_sauce.sh
GLOB_PATTERNS='test/functional/android/apidemos/**/*-specs.js'
node ci/tools/testfiles-tool.js split "${GLOB_PATTERNS}" > ci/test-split.json
cp ci/mochas/android-mocha ci/mocha
BRANCH_CAT=android ./ci/git-push.sh
fi
elif [[ $CI_CONFIG == 'build_selendroid' ]]; then
source ./ci/android_env
echo JAVA_HOME: $JAVA_HOME
@@ -46,14 +54,6 @@ elif [[ $CI_CONFIG == 'functional' ]]; then
TEST_FILES=$(node ci/tools/testfiles-tool.js list ci/test-split.json "${TEST_GROUP}")
echo "TEST_FILES --> ${TEST_FILES}"
if [[ -n "$TEST_FILES" ]]; then
SAUCE=1 \
VERBOSE=1 \
TARBALL="${TARBALL}" \
DEVICE="ios71" \
VERSION="7.1" \
./node_modules/.bin/mocha \
--recursive \
-g "@skip-ci|@skip-ios71|@skip-ios7|@skip-ios-all" -i \
${TEST_FILES}
TARBALL=$TARBALL ci/mocha ${TEST_FILES}
fi
fi
ci/tools/travis-yml-tool.js
+3 -1
View File
@@ -8,13 +8,14 @@ var fs = require("fs");
var source = fs.readFileSync(args[0], 'UTF8');
var target = fs.readFileSync(args[1], 'UTF8');
// replace secure lines
// replace secure env variable
var secureLines = source.match(/^\s*- secure.*/gm).join('\n');
secureLines = secureLines.replace(/^\s*-/mg, ' -');
assert(secureLines);
target = target.replace(/(^\s*- secure.*\r?\n)+/m, ' # <SECURE>\n');
target = target.replace(/^ # <SECURE>.*$/m, secureLines);
// replace env variables
_([
'SAUCE_REST_ROOT', 'APPIUM_HOST',
'APPIUM_PORT', 'SAUCE_USERNAME',
@@ -24,5 +25,6 @@ _([
regex = new RegExp('- ' + varName + '=.*','g');
target = target.replace(regex, line);
});
console.log(target);
test/functional/android/apidemos/alerts-specs.js
+1 -1
View File
@@ -6,7 +6,7 @@ var env = require('../../../helpers/env')
, net = require('net')
, io = require('socket.io-client');
describe("apidemos - alerts - @skip-android-all -", function () {
describe("apidemos - alerts @skip-android-all", function () {
setup(this, desired);
test/functional/android/apidemos/attributes-specs.js
+3 -4
View File
@@ -2,17 +2,16 @@
var env = require('../../../helpers/env')
, setup = require("../../common/setup-base")
, desired = require("./desired")
, androidReset = require('../../../helpers/reset').androidReset;
, desired = require("./desired");
describe("apidemos - attributes -", function () {
describe("apidemos - attributes", function () {
var driver;
setup(this, desired).then(function (d) { driver = d; });
if (env.FAST_TESTS) {
beforeEach(function (done) {
androidReset('com.example.android.apis', '.ApiDemos').nodeify(done);
driver.resetApp().nodeify(done);
});
}
test/functional/android/apidemos/basic-specs.js
+1 -1
View File
@@ -13,7 +13,7 @@ var env = require('../../../helpers/env')
, _ = require('underscore')
, androidReset = require('../../../helpers/reset').androidReset;
describe("apidemo - basic -", function () {
describe("apidemo - basic @skip-ci", function () {
afterEach(function (done) {
setTimeout(function () { done(); }, 2000); // cooldown
test/functional/android/apidemos/file-specs.js
+1 -1
View File
@@ -3,7 +3,7 @@
var setup = require("../../common/setup-base")
, desired = require("./desired");
describe("apidemos - push & pull file -", function () {
describe("apidemos - file", function () {
var driver;
setup(this, desired).then(function (d) { driver = d; });
test/functional/android/apidemos/find-element-specs.js
+3 -4
View File
@@ -4,17 +4,16 @@ var env = require('../../../helpers/env')
, setup = require("../../common/setup-base")
, desired = require("./desired")
, atv = 'android.widget.TextView'
, alv = 'android.widget.ListView'
, androidReset = require('../../../helpers/reset').androidReset;
, alv = 'android.widget.ListView';
describe("apidemo - find elements -", function () {
describe("apidemo - find elements", function () {
var driver;
setup(this, desired).then(function (d) { driver = d; });
if (env.FAST_TESTS) {
beforeEach(function (done) {
androidReset('com.example.android.apis', '.ApiDemos').nodeify(done);
driver.resetApp().nodeify(done);
});
}
test/functional/android/apidemos/gestures-specs.js
+1 -1
View File
@@ -7,7 +7,7 @@ var env = require('../../../helpers/env')
, droidList = 'android.widget.ListView'
, Q = require("q");
describe("apidemo - gestures -", function () {
describe("apidemo - gestures", function () {
var driver;
setup(this, desired).then(function (d) { driver = d; });
test/functional/android/apidemos/keyboard-specs.js
+3 -4
View File
@@ -2,16 +2,15 @@
var setup = require("../../common/setup-base")
, desired = require("./desired")
, _ = require('underscore')
, androidReset = require('../../../helpers/reset').androidReset;
, _ = require('underscore');
describe("apidemo - keyboard -", function () {
describe("apidemo - keyboard", function () {
var driver;
setup(this, _.defaults({appActivity: "view.Controls1" }, desired))
.then(function (d) { driver = d; });
beforeEach(function (done) {
androidReset('com.example.android.apis', 'view.Controls1').nodeify(done);
driver.resetApp().nodeify(done);
});
it('should be able to edit a text field', function (done) {
test/functional/android/apidemos/location-specs.js
+3 -4
View File
@@ -1,15 +1,14 @@
"use strict";
var setup = require("../../common/setup-base")
, desired = require("./desired")
, path = require('path');
, desired = require("./desired");
var desired = {
app: path.resolve(__dirname, '../../../../sample-code/apps/gps-demo/bin/GPSTutorial1.apk')
app: 'sample-code/apps/gps-demo/bin/GPSTutorial1.apk'
};
// TODO: bring back when new wd is published with setGeoLocation
describe("apidemo - location - @skip-ios-all", function () {
describe("apidemo - location", function () {
var driver;
setup(this, desired).then(function (d) { driver = d; });
test/functional/android/apidemos/orientation-specs.js
+3 -4
View File
@@ -2,16 +2,15 @@
var setup = require("../../common/setup-base")
, env = require('../../../helpers/env')
, desired = require("./desired")
, androidReset = require('../../../helpers/reset').androidReset;
, desired = require("./desired");
describe("apidemos - orientation -", function () {
describe("apidemos - orientation", function () {
var driver;
setup(this, desired).then(function (d) { driver = d; });
if (env.FAST_TESTS) {
beforeEach(function (done) {
androidReset('com.example.android.apis', '.ApiDemos').nodeify(done);
driver.resetApp().nodeify(done);
});
}
test/functional/android/apidemos/screenshot-specs.js
+1 -1
View File
@@ -3,7 +3,7 @@
var setup = require("../../common/setup-base")
, desired = require("./desired");
describe("apidemos - screenshot -", function () {
describe("apidemos - screenshot", function () {
var driver;
setup(this, desired).then(function (d) { driver = d; });
test/functional/android/apidemos/source-specs.js
+1 -1
View File
@@ -5,7 +5,7 @@ var setup = require("../../common/setup-base")
, XMLDom = require("xmldom").DOMParser
, desired = require("./desired");
describe("apidemos - source -", function () {
describe("apidemos - source", function () {
var driver;
setup(this, desired).then(function (d) { driver = d; });
test/functional/android/apidemos/touch-specs.js
+2 -3
View File
@@ -3,7 +3,6 @@
var env = require('../../../helpers/env')
, setup = require("../../common/setup-base")
, desired = require("./desired")
, androidReset = require('../../../helpers/reset').androidReset
, wd = require("wd")
, droidText = 'android.widget.TextView'
, droidList = 'android.widget.ListView'
@@ -11,13 +10,13 @@ var env = require('../../../helpers/env')
, MultiAction = wd.MultiAction;
describe("apidemo - touch gestures -", function () {
describe("apidemo - touch gestures", function () {
var driver;
setup(this, desired).then(function (d) { driver = d; });
if (env.FAST_TESTS) {
beforeEach(function (done) {
androidReset('com.example.android.apis', '.ApiDemos').nodeify(done);
driver.resetApp().nodeify(done);
});
}
test/functional/android/chrome-specs.js
-6
View File
@@ -1,6 +0,0 @@
"use strict";
process.env.DEVICE = process.env.DEVICE || "android";
describe("chrome - @android-arm-only -", function () {
require('../common/webview-base')('chromium');
});