adding in files that were removed in the rebase

e2e/engine/bridge/client.js → e2e/bridge/client.js

@@ -3,12 +3,12 @@ import { Platform } from "react-native";
 import invariant from "invariant";
 import { Subject } from "rxjs/Subject";
 import type { AccountRaw } from "@ledgerhq/live-common/lib/types";
-import { store } from "../../../src/context/LedgerStore";
-import { importSettings } from "../../../src/actions/settings";
-import { setAccounts } from "../../../src/actions/accounts";
-import { acceptTerms } from "../../../src/logic/terms";
-import accountModel from "../../../src/logic/accountModel";
-import { navigate } from "../../../src/rootnavigation";
+import { store } from "../../src/context/LedgerStore";
+import { importSettings } from "../../src/actions/settings";
+import { setAccounts } from "../../src/actions/accounts";
+import { acceptTerms } from "../../src/logic/terms";
+import accountModel from "../../src/logic/accountModel";
+import { navigate } from "../../src/rootnavigation";
 
 let ws: WebSocket;
 

e2e/engine/bridge/server.js → e2e/bridge/server.js

@@ -3,8 +3,8 @@ import { Server } from "ws";
 import path from "path";
 import fs from "fs";
 import type { E2EBridgeMessage } from "./client";
-import { $waitFor } from "../utils";
-import { NavigatorName } from "../../../src/const";
+import { waitForElement } from "../helpers";
+import { NavigatorName } from "../../src/const";
 
 let wss: Server;
 
@@ -39,11 +39,11 @@ export async function loadConfig(
 
   if (data.accounts.length) {
     postMessage({ type: "importAccounts", payload: data.accounts });
-    await $waitFor("PortfolioAccountsList", -1, 10000);
+    // await $waitFor("PortfolioAccountsList", -1, 10000);
     return;
   }
 
-  await $waitFor("PortfolioEmptyAccount");
+  await waitForElement("PortfolioEmptyAccount");
 }
 
 function navigate(name: string) {

e2e/config.json

@@ -1,9 +1,11 @@
 {
+  "globalSetup": "./global-setup.js",
+  "globalTeardown": "./global-teardown.js",
+  "setupFilesAfterEnv": ["./setup.js"],
   "testEnvironment": "./environment",
   "testRunner": "jest-circus/runner",
   "testTimeout": 300000,
   "testRegex": "\\.spec\\.js$",
   "reporters": ["detox/runners/jest/streamlineReporter"],
-  "verbose": true,
-  "setupFilesAfterEnv": ["./init.js"]
+  "verbose": true
 }

e2e/models/passwordEntryPage.js

@@ -0,0 +1,12 @@
+import * as testHelpers from "../helpers";
+
+export default class PasswordEntryPage {
+  static async enterPassword(password) {
+    await testHelpers.typeText("password-text-input", password);
+  }
+
+  static async login() {
+    await testHelpers.tapByText("Log in");
+    await testHelpers.delay(10000);
+  }
+}

e2e/models/settings/generalSettingsPage.js

@@ -0,0 +1,22 @@
+import * as testHelpers from "../../helpers";
+
+export default class GeneralSettingsPage {
+  static async togglePassword() {
+    await testHelpers.scrollToElementById(
+      "password-settings-toggle",
+      "general-settings-scroll-view",
+      200,
+    );
+
+    await testHelpers.tap("password-settings-toggle");
+  }
+
+  static async enterNewPassword(passwordText) {
+    await testHelpers.typeText("password-text-input", passwordText);
+    await testHelpers.tap("Proceed");
+  }
+
+  static async isVisible() {
+    await testHelpers.verifyTextIsVisible("General");
+  }
+}

e2e/models/settings/settingsPage.js

@@ -0,0 +1,7 @@
+import * as testHelpers from "../../helpers";
+
+export default class SettingsPage {
+  static async navigateToGeneralSettings() {
+    await testHelpers.tap("general-settings-card");
+  }
+}