Merge pull request #288 from appium/isaac-web

Remove ios-webviewapp dep and use uicatalog

package.json

@@ -72,7 +72,6 @@
     "glob": "^7.1.0",
     "gulp": "^3.8.11",
     "ios-uicatalog": "^1.0.4",
-    "ios-webview-app": "^1.0.4",
     "pre-commit": "^1.1.3",
     "request-promise": "^2.0.0",
     "sinon": "^1.17.4",

test/functional/desired.js

@@ -1,5 +1,4 @@
 import uiCatalogApp from 'ios-uicatalog';
-import iosWebViewApp from 'ios-webview-app';
 import _ from 'lodash';
 import path from 'path';
 import glob from 'glob';
@@ -39,17 +38,8 @@ const UICATALOG_SIM_CAPS = _.defaults({
 }, GENERIC_CAPS);
 delete UICATALOG_SIM_CAPS.noReset; // do not want to have no reset on the tests that use this
 
-const WEBVIEW_CAPS = _.defaults({
-  app: path.resolve('.', 'node_modules', 'ios-webview-app', iosWebViewApp[REAL_DEVICE ? 0 : 1]),
-}, GENERIC_CAPS, REAL_DEVICE_CAPS);
-
-const WEBVIEW_SIM_CAPS = _.defaults({
-  app: path.resolve('.', 'node_modules', 'ios-webview-app', iosWebViewApp[1]),
-}, GENERIC_CAPS);
-
 const SAFARI_CAPS = _.defaults({
   browserName: 'Safari',
 }, GENERIC_CAPS, REAL_DEVICE_CAPS);
 
-export { UICATALOG_CAPS, UICATALOG_SIM_CAPS, WEBVIEW_CAPS, WEBVIEW_SIM_CAPS,
-         SAFARI_CAPS, PLATFORM_VERSION };
+export { UICATALOG_CAPS, UICATALOG_SIM_CAPS, SAFARI_CAPS, PLATFORM_VERSION };

test/functional/web/webview-e2e-specs.js

@@ -1,21 +1,26 @@
 import chai from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import _ from 'lodash';
-import { WEBVIEW_CAPS } from '../desired';
+import B from 'bluebird';
+import { UICATALOG_CAPS } from '../desired';
 import { initSession, deleteSession } from '../helpers/session';
 import { GUINEA_PIG_PAGE } from './helpers';
 
 
 chai.should();
 chai.use(chaiAsPromised);
 
-// TODO: the rd gets disconnected for some reason
-describe.skip('Webview', function () {
+describe('Webview', function () {
   this.timeout(120 * 1000);
 
   let driver;
   before(async () => {
-    driver = await initSession(WEBVIEW_CAPS);
+    driver = await initSession(UICATALOG_CAPS);
+
+    let el = await driver.elementByAccessibilityId('Web View');
+    await driver.execute('mobile: scroll', {element: el, toVisible: true});
+    await el.click();
+    await B.delay(500);
   });
   after(async () => {
     await deleteSession();