Update tests

Author: mykola-mokhnach

test/e2e/commands/file-movement-e2e-specs.js

@@ -2,21 +2,7 @@ import { remote as wdio } from 'webdriverio';
 import path from 'path';
 import { tempDir, fs } from 'appium/support';
 import { isAdmin } from '../../../lib/installer';
-import { TEST_HOST, TEST_PORT } from '../constants';
-
-
-const TEST_CAPS = {
-  platformName: 'Windows',
-  'appium:automationName': 'windows',
-  'appium:app': 'Root',
-};
-
-const WDIO_OPTS = {
-  hostname: TEST_HOST,
-  port: TEST_PORT,
-  connectionRetryCount: 0,
-  capabilities: TEST_CAPS
-};
+import { buildWdIoOptions } from '../helpers';
 
 describe('file movement', function () {
   let driver;
@@ -36,7 +22,7 @@ describe('file movement', function () {
       return this.skip();
     }
 
-    driver = await wdio(WDIO_OPTS);
+    driver = await wdio(buildWdIoOptions('Root'));
   });
 
   afterEach(async function () {

test/e2e/commands/winapi-e2e-specs.js

@@ -1,54 +1,61 @@
-import * as commands from '../../../lib/commands/gestures';
-import { log } from '../../../lib/logger';
-
+import { buildWdIoOptions } from '../helpers';
+import { remote as wdio } from 'webdriverio';
 
 describe('winapi', function () {
   let chai;
+  let driver;
 
   before(async function () {
     chai = await import('chai');
     const chaiAsPromised = await import('chai-as-promised');
 
     chai.should();
     chai.use(chaiAsPromised.default);
-    commands.log = log;
+
+    driver = await wdio(buildWdIoOptions('Root'));
   });
 
-  after(function () {
-    delete commands.log;
+  after(async function () {
+    try {
+      if (driver) {
+        await driver.deleteSession();
+      }
+    } finally {
+      driver = null;
+    }
   });
 
   describe('mouseClick', function () {
     it('performs single click with Shift+Ctrl', async function () {
-      await commands.windowsClick({
+      await driver.execute('windows: click', [{
         x: 100,
         y: 100,
         modifierKeys: ['shift', 'ctrl'],
-      });
+      }]);
     });
 
     it('performs long click', async function () {
-      await commands.windowsClick({
+      await driver.execute('windows: click', [{
         x: 100,
         y: 100,
         durationMs: 500,
-      });
+      }]);
     });
 
     it('performs double click', async function () {
-      await commands.windowsClick({
+      await driver.execute('windows: click', [{
         x: 100,
         y: 100,
         times: 2,
-      });
+      }]);
     });
 
     it('performs context click', async function () {
-      await commands.windowsClick({
+      await driver.execute('windows: click', [{
         x: 100,
         y: 100,
         button: 'right',
-      });
+      }]);
     });
 
     it('fails if wrong input is provided', async function () {
@@ -84,35 +91,35 @@ describe('winapi', function () {
       ];
 
       for (const errData of errDatas) {
-        await commands.windowsClick(errData).should.be.rejected;
+        await driver.execute('windows: click', [errData]).should.be.rejected;
       }
     });
   });
 
   describe('mouseScroll', function () {
     it('performs vertical scroll gesture with Ctrl+Alt depressed', async function () {
-      await commands.windowsScroll({
+      await driver.execute('windows: scroll', [{
         x: 600,
         y: 300,
         deltaY: 200,
         modifierKeys: ['ctrl', 'alt'],
-      });
+      }]);
     });
 
     it('performs horizontal scroll gesture', async function () {
-      await commands.windowsScroll({
+      await driver.execute('windows: scroll', [{
         x: 600,
         y: 300,
         deltaX: -200,
-      });
+      }]);
     });
 
     it('does nothing if zero delta is provided', async function () {
-      await commands.windowsScroll({
+      await driver.execute('windows: scroll', [{
         x: 100,
         y: 100,
         deltaY: 0,
-      });
+      }]);
     });
 
     it('fails if wrong input is provided', async function () {
@@ -136,38 +143,38 @@ describe('winapi', function () {
       ];
 
       for (const errData of errDatas) {
-        await commands.windowsScroll(errData).should.be.rejected;
+        await driver.execute('windows: scroll', [errData]).should.be.rejected;
       }
     });
   });
 
   describe('mouseClickAndDrag', function () {
     it('performs drag gesture with Ctrl+Shift depressed', async function () {
-      await commands.windowsClickAndDrag({
+      await driver.execute('windows: clickAndDrag', [{
         startX: 600,
         startY: 300,
         endX: 500,
         endY: 400,
         modifierKeys: ['ctrl', 'shift'],
-      });
+      }]);
     });
   });
 
   describe('windowsHover', function () {
     it('performs hover gesture with Ctrl+Shift depressed', async function () {
-      await commands.windowsHover({
+      await driver.execute('windows: clickAndDrag', [{
         startX: 600,
         startY: 300,
         endX: 500,
         endY: 400,
         modifierKeys: ['ctrl', 'shift'],
-      });
+      }]);
     });
   });
 
   describe('keys', function () {
     it('performs complex key input', async function () {
-      await commands.windowsKeys({
+      await driver.execute('windows: keys', [{
         actions: [
           {virtualKeyCode: 0x10, down: true},
           {pause: 100},
@@ -176,7 +183,7 @@ describe('winapi', function () {
           {pause: 100},
           {virtualKeyCode: 0x10, down: false},
         ]
-      });
+      }]);
     });
 
     it('fails if wrong input is provided', async function () {
@@ -199,7 +206,7 @@ describe('winapi', function () {
       ];
 
       for (const errData of errDatas) {
-        await commands.windowsKeys(errData).should.be.rejected;
+        await driver.execute('windows: keys', [errData]).should.be.rejected;
       }
     });
   });

test/e2e/constants.js

@@ -1,20 +1,6 @@
 import { remote as wdio } from 'webdriverio';
 import { isAdmin } from '../../lib/installer';
-import { TEST_HOST, TEST_PORT } from './constants';
-
-
-const TEST_CAPS = {
-  platformName: 'Windows',
-  'appium:automationName': 'windows',
-  'appium:app': 'Microsoft.WindowsCalculator_8wekyb3d8bbwe!App',
-};
-
-const WDIO_OPTS = {
-  hostname: TEST_HOST,
-  port: TEST_PORT,
-  connectionRetryCount: 0,
-  capabilities: TEST_CAPS
-};
+import { buildWdIoOptions } from './helpers';
 
 describe('Driver', function () {
   let driver;
@@ -33,7 +19,7 @@ describe('Driver', function () {
       return this.skip();
     }
 
-    driver = await wdio(WDIO_OPTS);
+    driver = await wdio(buildWdIoOptions('Microsoft.WindowsCalculator_8wekyb3d8bbwe!App'));
   });
 
   afterEach(async function () {

test/e2e/driver-e2e-specs.js

@@ -0,0 +1,21 @@
+export const TEST_PORT = parseInt(process.env.APPIUM_TEST_SERVER_PORT || 4788, 10);
+export const TEST_HOST = process.env.APPIUM_TEST_SERVER_HOST || '127.0.0.1';
+
+
+/**
+ *
+ * @param {string} app
+ * @returns {Record<string, any>}
+ */
+export function buildWdIoOptions(app) {
+  return {
+    hostname: TEST_HOST,
+    port: TEST_PORT,
+    connectionRetryCount: 0,
+    capabilities: {
+      platformName: 'Windows',
+      'appium:automationName': 'windows',
+      'appium:app': app,
+    }
+  };
+}