rename to webdriver2 and support mobileextension

Author: licanhua

.npmignore

@@ -0,0 +1 @@
+example

README.md

@@ -1 +1,4 @@
-**Make selenium-webdriver to drive appium to do native app testing**
+* A wrapper of Selenium-webdriver
+* A bridge to drive appium to support native app automation
+* Simple logic to wait for element to show up
+* Support PageObject pattern. Easy to wait for pages to load complete or navigate among pages

example/__tests__/calculator.ts

@@ -1,66 +1,66 @@
-import { createAppiumWebDriver, windowsNativeAppCapabilities } from 'selenium-appium'
+import { createWebDriver2, windowsNativeAppCapabilities } from 'selenium-appium'
 import { By } from 'selenium-webdriver'
 jest.setTimeout(50000);
 
 const calculatorAppId = 'Microsoft.WindowsCalculator_8wekyb3d8bbwe!App'
-const driver = createAppiumWebDriver(windowsNativeAppCapabilities(calculatorAppId))
+const driver = createWebDriver2(windowsNativeAppCapabilities(calculatorAppId))
 
 beforeAll(() => {
-  return driver.start();
+  return driver.start(); 
 });
 
 afterAll(() => {
   return driver.stop();
 });
 
 async function getCalculatorResultText() {
-  const text = await driver.getByAccessibilityId('CalculatorResults').getText();
+  const text = await driver.getByNativeAccessibilityId('CalculatorResults').getText();
   return text.replace('Display is', '').trim();
 }
 
 describe('Addition', () => {
   // Applies only to tests in this describe block
   beforeEach(async () => {
-    await driver.getByName('Clear').clear();
+    await driver.getByNativeName('Clear').clear();
   });
 
   test('Addition', async () => {
     // Find the buttons by their names and click them in sequence to perform 1 + 7 = 8
-    await driver.getByName('One').click();
-    await driver.getByName('Plus').click();
-    await driver.getByName('Seven').click();
-    await driver.getByName('Equals').click();
+    await driver.getByNativeName('One').click();
+    await driver.getByNativeName('Plus').click();
+    await driver.getByNativeName('Seven').click();
+    await driver.getByNativeName('Equals').click();
     expect(await getCalculatorResultText()).toBe('8');
   });
 
   test('Division', async () => {
     // Find the buttons by their accessibility ids and click them in sequence to perform 88 / 11 = 8
-    await driver.getByAccessibilityId('num8Button').click();
-    await driver.getByAccessibilityId('num8Button').click();
-    await driver.getByAccessibilityId('divideButton').click();
-    await driver.getByAccessibilityId('num1Button').click();
-    await driver.getByAccessibilityId('num1Button').click();
-    await driver.getByAccessibilityId('equalButton').click();
+    await driver.getByNativeAccessibilityId('num8Button').click();
+    await driver.getByNativeAccessibilityId('num8Button').click();
+    await driver.getByNativeAccessibilityId('divideButton').click();
+    await driver.getByNativeAccessibilityId('num1Button').click();
+    await driver.getByNativeAccessibilityId('num1Button').click();
+    await driver.getByNativeAccessibilityId('equalButton').click();
     expect(await getCalculatorResultText()).toBe('8');
   });
 
   test('Multiplication', async () => {
     // Find the buttons by their names using XPath and click them in sequence to perform 9 x 9 = 81
-    await driver.get(By.xpath("//Button[@Name='Nine']")).click();
-    await driver.get(By.xpath("//Button[@Name='Multiply by']")).click();
-    await driver.get(By.xpath("//Button[@Name='Nine']")).click();
-    await driver.get(By.xpath("//Button[@Name='Equals']")).click();
+    await driver.getBy(By.xpath("//Button[@Name='Nine']")).click();
+    await driver.getBy(By.xpath("//Button[@Name='Multiply by']")).click();
+    await driver.getBy(By.xpath("//Button[@Name='Nine']")).click();
+    await driver.getBy(By.xpath("//Button[@Name='Equals']")).click();
     expect(await getCalculatorResultText()).toBe('81');
   });
 
 
 
   test('Subtraction', async () => {
     // Find the buttons by their accessibility ids using XPath and click them in sequence to perform 9 - 1 = 8
-    await driver.get(By.xpath("//Button[@AutomationId=\"num9Button\"]")).click();
-    await driver.get(By.xpath("//Button[@AutomationId=\"minusButton\"]")).click();
-    await driver.get(By.xpath("//Button[@AutomationId=\"num1Button\"]")).click();
-    await driver.get(By.xpath("//Button[@AutomationId=\"equalButton\"]")).click();
+    await driver.getBy(By.xpath("//Button[@AutomationId=\"num9Button\"]")).click();
+    await driver.getBy(By.xpath("//Button[@AutomationId=\"minusButton\"]")).click();
+    await driver.getBy(By.xpath("//Button[@AutomationId=\"num1Button\"]")).click();
+    await driver.getBy(By.xpath("//Button[@AutomationId=\"equalButton\"]")).click();
     expect(await getCalculatorResultText()).toBe('8');
   });
 });