simply override device for selendroid rather than including in caps

appium · Feb 6, 2014 · cc1a922 · cc1a922
1 parent ccfbd07
commit cc1a922
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/test/functional/selendroid/basic.js b/test/functional/selendroid/basic.js
@@ -1,5 +1,6 @@
 "use strict";
 
+process.env.DEVICE = process.env.DEVICE || "selendroid";
 var setup = require("../common/setup-base")
   , sessionUtils = require('../../helpers/session-utils')
   , path = require('path')
@@ -9,8 +10,7 @@ var setup = require("../common/setup-base")
 var desired = {
   app: path.resolve(__dirname, "../../../sample-code/apps/ApiDemos/bin/ApiDemos-debug.apk"),
   'app-package': 'com.example.android.apis',
-  'app-activity': '.ApiDemos',
-  device: 'selendroid'
+  'app-activity': '.ApiDemos'
 };
 
   // , appAct2 = "ApiDemos"

diff --git a/test/functional/selendroid/web_view.js b/test/functional/selendroid/web_view.js
@@ -1,15 +1,16 @@
 /*global beforeEach:true */
 "use strict";
 
+process.env.DEVICE = process.env.DEVICE || "selendroid";
 var env = require('../../helpers/env')
   , setup = require("../common/setup-base")
   , path = require('path');
 
 var desired = {
-  app: path.resolve(__dirname, "../../../sample-code/apps/WebViewDemo/target/selendroid-test-app-0.8.0.apk"),
+  app: path.resolve(__dirname, "../../../sample-code/apps/WebViewDemo/target/" +
+                    "selendroid-test-app-0.8.0.apk"),
   'app-package': 'io.selendroid.testapp',
-  'app-activity': '.HomeScreenActivity',
-  device: 'selendroid'
+  'app-activity': '.HomeScreenActivity'
 };
 
 // if it doesn't work run: adb uninstall io.selendroid.testapp