refactor: Stopped using browser as a variable name

tests/cases/FilterRules.test.ts

@@ -31,16 +31,16 @@ describe('FilterRules', () => {
       },
     ],
   ])('should block %s if set', async (setting, { log, number }) => {
-    const browser = await initializeDriver();
-    await allowPermissions(browser);
-    await waitForEmptyLog(browser);
+    const driver = await initializeDriver();
+    await allowPermissions(driver);
+    await waitForEmptyLog(driver);
 
-    await openSettings(browser);
-    await toggleSetting(browser, setting);
-    expect(await getSetting(browser, setting)).toBe(true);
-    await goBack(browser);
-    await browser.gsmCall(number, 'call');
-    await waitForLogEntry(browser, log);
+    await openSettings(driver);
+    await toggleSetting(driver, setting);
+    expect(await getSetting(driver, setting)).toBe(true);
+    await goBack(driver);
+    await driver.gsmCall(number, 'call');
+    await waitForLogEntry(driver, log);
   });
 
   it.each([
@@ -59,18 +59,18 @@ describe('FilterRules', () => {
       },
     ],
   ])('should allow %s if not set', async (setting, { log, number }) => {
-    const browser = await initializeDriver();
-    await allowPermissions(browser);
-    await waitForEmptyLog(browser);
+    const driver = await initializeDriver();
+    await allowPermissions(driver);
+    await waitForEmptyLog(driver);
 
-    await openSettings(browser);
-    expect(await getSetting(browser, setting)).toBe(false);
-    await goBack(browser);
-    await browser.gsmCall(number, 'call');
-    await browser.pause(1000);
-    await browser.gsmCall(number, 'cancel');
-    await browser.pause(1000);
-    await waitForLogEntry(browser, log);
+    await openSettings(driver);
+    expect(await getSetting(driver, setting)).toBe(false);
+    await goBack(driver);
+    await driver.gsmCall(number, 'call');
+    await driver.pause(1000);
+    await driver.gsmCall(number, 'cancel');
+    await driver.pause(1000);
+    await waitForLogEntry(driver, log);
   });
 
   it('should allow calls by contacts if set', async () => {

tests/utilities/addNewRule.ts

@@ -2,40 +2,38 @@ import { Browser } from 'webdriverio';
 import { RuleAction, RuleEnabled, RuleMatchType } from './settings';
 
 export default async function addNewRule(
-  browser: Browser,
+  driver: Browser,
   status: RuleEnabled,
   action: RuleAction,
   matchType: RuleMatchType,
 ) {
-  const addRuleButton = browser.$('accessibility id:Add new rule');
+  const addRuleButton = driver.$('accessibility id:Add new rule');
   await addRuleButton.click();
 
-  const enabledSpinner = browser.$(
-    'id:com.novyr.callfilter:id/enabled_spinner',
-  );
+  const enabledSpinner = driver.$('id:com.novyr.callfilter:id/enabled_spinner');
   await enabledSpinner.click();
 
-  const enabledOption = browser.$(
+  const enabledOption = driver.$(
     `//android.widget.CheckedTextView[@text="${status}"]`,
   );
   await enabledOption.click();
 
-  const actionSpinner = browser.$('id:com.novyr.callfilter:id/action_spinner');
+  const actionSpinner = driver.$('id:com.novyr.callfilter:id/action_spinner');
   await actionSpinner.click();
 
-  const actionOption = browser.$(
+  const actionOption = driver.$(
     `//android.widget.CheckedTextView[@text="${action}"]`,
   );
   await actionOption.click();
 
-  const typeSpinner = browser.$('id:com.novyr.callfilter:id/type_spinner');
+  const typeSpinner = driver.$('id:com.novyr.callfilter:id/type_spinner');
   await typeSpinner.click();
 
-  const typeOption = browser.$(
+  const typeOption = driver.$(
     `//android.widget.CheckedTextView[@text="${matchType}"]`,
   );
   await typeOption.click();
 
-  const okButton = browser.$('id:android:id/button1');
+  const okButton = driver.$('id:android:id/button1');
   await okButton.click();
 }

tests/utilities/goBack.ts

@@ -1,6 +1,6 @@
 import { Browser } from 'webdriverio';
 
-export default async function goBack(browser: Browser): Promise<void> {
-  const backButton = browser.$('accessibility id:Navigate up');
+export default async function goBack(driver: Browser): Promise<void> {
+  const backButton = driver.$('accessibility id:Navigate up');
   await backButton.click();
 }

tests/utilities/log.ts

@@ -1,15 +1,15 @@
 import { Browser } from 'webdriverio';
 
-export async function waitForEmptyLog(browser: Browser): Promise<void> {
-  const emptyView = await browser.$('id:com.novyr.callfilter:id/empty_view');
+export async function waitForEmptyLog(driver: Browser): Promise<void> {
+  const emptyView = await driver.$('id:com.novyr.callfilter:id/empty_view');
   await emptyView.waitForDisplayed();
 }
 
 export async function waitForLogEntry(
-  browser: Browser,
+  driver: Browser,
   message: string,
 ): Promise<void> {
-  const log = await browser.$(
+  const log = await driver.$(
     `//*[@resource-id="com.novyr.callfilter:id/log_list_message"][@text="${message}"]`,
   );
   await log.waitForDisplayed();

tests/utilities/mockContact.ts

@@ -15,18 +15,18 @@ async function hasMockContact(
 }
 
 export default async function createMockContact(
-  browser: Browser,
+  driver: Browser,
   name: string,
   phoneNumber: string,
 ): Promise<void> {
-  if (await hasMockContact(browser, phoneNumber)) {
+  if (await hasMockContact(driver, phoneNumber)) {
     return;
   }
 
-  const originalPackage = await browser.getCurrentPackage();
-  const originalActivity = await browser.getCurrentActivity();
+  const originalPackage = await driver.getCurrentPackage();
+  const originalActivity = await driver.getCurrentActivity();
 
-  await browser.executeScript('mobile: shell', [
+  await driver.executeScript('mobile: shell', [
     {
       command: 'am',
       args:
@@ -38,11 +38,11 @@ export default async function createMockContact(
     },
   ]);
 
-  const saveButton = await browser.$(
+  const saveButton = await driver.$(
     'id:com.android.contacts:id/editor_menu_save_button',
   );
   await saveButton.click();
-  await browser.pause(500);
+  await driver.pause(500);
 
-  await browser.startActivity(originalPackage, originalActivity);
+  await driver.startActivity(originalPackage, originalActivity);
 }

tests/utilities/settings.ts

@@ -21,10 +21,10 @@ export enum RuleMatchType {
 }
 
 export async function getSetting(
-  browser: Browser,
+  driver: Browser,
   setting: RuleMatchType,
 ): Promise<boolean> {
-  const privateNumbersSwitch = await browser.$(
+  const privateNumbersSwitch = await driver.$(
     `//android.widget.TextView[@text="${setting}"]` +
       '/parent::android.widget.LinearLayout' +
       '/following-sibling::android.widget.Switch',
@@ -33,28 +33,28 @@ export async function getSetting(
   return (await privateNumbersSwitch.getAttribute('checked')) === 'true';
 }
 
-export async function openSettings(browser: Browser) {
-  const optionsButton = await browser.$('accessibility id:More options');
+export async function openSettings(driver: Browser) {
+  const optionsButton = await driver.$('accessibility id:More options');
   await optionsButton.waitForDisplayed();
   await optionsButton.click();
 
-  const settingsButton = await browser.$(
+  const settingsButton = await driver.$(
     '//android.widget.TextView[@text="Settings"]',
   );
   await settingsButton.waitForDisplayed();
   await settingsButton.click();
 
-  const filterRulesHeading = await browser.$(
+  const filterRulesHeading = await driver.$(
     '//android.widget.TextView[@text="Filter Rules"]',
   );
   await filterRulesHeading.waitForDisplayed();
 }
 
 export async function toggleSetting(
-  browser: Browser,
+  driver: Browser,
   setting: RuleMatchType,
 ): Promise<void> {
-  const privateNumbersText = await browser.$(
+  const privateNumbersText = await driver.$(
     `//android.widget.TextView[@text="${setting}"]`,
   );
   await privateNumbersText.waitForDisplayed();