Update screenshot generation commands

Author: rigor789

.travis.yml

@@ -73,7 +73,8 @@ matrix:
       script:
         - npm install -g appium
         - npm install
-        - travis_retry npm run appium --runType=android23 --sauceLab=true --appLocation=$ANDROID_PACKAGE
+        - appium &
+        - travis_retry npm run appium -- --runType=android23 --sauceLab=true --appPath=$ANDROID_PACKAGE
     - os: linux
       env:
         - iOS="10"
@@ -82,4 +83,5 @@ matrix:
       script:
         - npm install -g appium
         - npm install
-        - travis_wait travis_retry npm run appium --runType=ios-simulator103iPhone6 --sauceLab=true --appLocation=$IOS_PACKAGE
+        - appium &
+        - travis_wait travis_retry npm run appium -- --runType=ios-simulator103iPhone6 --sauceLab=true --appPath=$IOS_PACKAGE

generate-screenshots.js

@@ -1,59 +1,67 @@
-require('yargs').config({
-  //runType: 'android23',
-  appiumCapsLocation: 'appium.capabilities.json'
-});
-
-const { startServer, stopServer, createDriver } = require('nativescript-dev-appium');
-
-const run = async () => {
-  await startServer();
-  const driver = await createDriver();
-
-  await [
-    'ActivityIndicator',
-    'Button',
-    'DatePicker',
-    'HtmlView',
-    'Image',
-    'Label',
-    'ListPicker',
-    'ListView',
-    'Progress',
-    'SearchBar',
-    'SegmentedBar',
-    'Slider',
-    'Switch',
-    'TabView',
-    'TextField',
-    'TextView',
-    'TimePicker',
-    'WebView',
-  ].forEach(async (component) => {
-    const listItem = await driver.findElementByText(component);
-    await listItem.tap();
-
-    await driver._driver.sleep(500);
-
-    if (component === 'HtmlView' || component === 'WebView') {
-      await driver._driver.sleep(4000);
-    }
-
-    await driver.takeScreenshot(`screenshots/${component}.png`);
+const argv = require('yargs').argv;
+const AppiumDriver = require('nativescript-dev-appium/lib/appium-driver').AppiumDriver;
+const fs = require('fs');
 
-    await driver.navBack();
+const components = [
+  'ActivityIndicator',
+  'Button',
+  'DatePicker',
+  'HtmlView',
+  'Image',
+  'Label',
+  'ListPicker',
+  'ListView',
+  'Progress',
+  'SearchBar',
+  'SegmentedBar',
+  'Slider',
+  'Switch',
+  'TabView',
+  'TextField',
+  'TextView',
+  'TimePicker',
+  'WebView',
+];
 
-    if (component === 'SearchBar') {
-      await driver.navBack();
-    }
-  });
+(async function () {
+  AppiumDriver.createAppiumDriver(4723, {
+    isSauceLab: argv.sauceLab || false,
+    runType: argv.runType,
+    appPath: argv.appPath, //'nativescriptvueuitests-debug.apk',
+    appiumCaps: require('./appium.capabilities.json')[argv.runType],
+    verbose: argv.verbose || false,
+  })
+    .then(driver => run(driver))
+    .then(() => console.log('Buh-Bye...'))
+    .catch((err) => console.log(err));
+})();
 
+const run = async (driver) => {
+  for (let component of components) {
+    await screenshotComponent(driver, component)
+  }
   await driver.quit();
-  await stopServer();
 };
 
-run().then(() => {
-  console.log('Buh-bye...');
-}).catch((err) => {
-  console.log('Something isn\'t quite right... :(');
-  console.error(err);
-});
+const screenshotComponent = async (driver, component) => {
+  console.log(`>>>>> ${component} >>>>>`);
+
+  const listItem = await driver.findElementByText(component);
+  await listItem.tap();
+
+  await driver._driver.sleep(500);
+
+  if (component === 'HtmlView' || component === 'WebView') {
+    await driver._driver.sleep(4000);
+  }
+
+  if (!fs.existsSync(`screenshots/${argv.runType}`)) {
+    await fs.mkdir(`screenshots/${argv.runType}`);
+  }
+
+  await driver.takeScreenshot(`screenshots/${argv.runType}/${component}.png`);
+  await driver.navBack();
+  if (component === 'SearchBar') {
+    await driver.navBack();
+  }
+};

package.json

@@ -13,9 +13,10 @@
     }
   },
   "dependencies": {
-    "nativescript-dev-appium": "^3.0.0",
+    "nativescript-dev-appium": "^3.1.0-2017-10-6-1",
     "nativescript-vue": "^0.1.12",
-    "tns-core-modules": "^3.2.0"
+    "tns-core-modules": "^3.2.0",
+    "yargs": "^9.0.1"
   },
   "devDependencies": {
     "appium": "^1.7.1",
@@ -37,7 +38,8 @@
     "ci.android.build": "tns build android",
     "ci.android.screenshots": "npm run appium --runtype=android23 --sauceLab=true",
     "ci.ios.build": "tns build ios",
-    "ci.ios.screenshots": "npm run appium --runtype=ios-simulator103iPhone6 --sauceLab=true"
+    "ci.ios.screenshots": "npm run appium --runtype=ios-simulator103iPhone6 --sauceLab=true",
+    "e2e": "mocha --opts ./e2e/config/mocha.opts"
   },
   "jest": {
     "testPathIgnorePatterns": [