Skip to content

fix: fix E2E fixtures for onboarded state #1316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christopherferreira9 merged 2 commits into from
Jul 17, 2025
Merged

fix: fix E2E fixtures for onboarded state #1316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7992e72
fix: fixes mobile onboarded fixture and fixes imports. Removes unnece…
Jul 15, 2025
7d4ce3a
fix: fixes proper file names
Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
332 changes: 176 additions & 156 deletions e2e/src/fixtures/FixtureBuilder.ts
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion e2e/src/fixtures/FixtureHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import FixtureServer from '@fixtures/FixtureServer';
import { FixtureBuilder } from '@fixtures/FixtureBuilder';
import { FIXTURE_SERVER_URL } from '@util/Constants';
import { FIXTURE_SERVER_URL } from '@util/constants';

// checks if server has already been started
const isFixtureServerStarted = async () => {
Expand Down
2 changes: 1 addition & 1 deletion e2e/src/fixtures/FixtureServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Koa from 'koa';
import * as http from "http";
import { FIXTURE_SERVER_HOST, FIXTURE_SERVER_PORT } from '@util/Constants';
import { FIXTURE_SERVER_HOST, FIXTURE_SERVER_PORT } from '@util/constants';

const CURRENT_STATE_KEY = '__CURRENT__';
const DEFAULT_STATE_KEY = '__DEFAULT__';
Expand Down
10 changes: 5 additions & 5 deletions e2e/src/screens/Android/AndroidSettingsOpeningLinksScreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ChainablePromiseElement } from 'webdriverio';
import { METAMASK_APP_NAME_ANDROID } from '@util/Constants';
import Gestures from '@util/Gestures';
import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector } from '@util/Selectors';
import { METAMASK_APP_NAME_ANDROID } from '@util/constants';
import { swipeByPercentage } from '@util/gestures';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector } from '@util/selectors';

class AndroidSettingsOpeningLinksScreen {
get openingLinksMetaMaskAppOption(): ChainablePromiseElement {
Expand Down Expand Up @@ -80,7 +80,7 @@ class AndroidSettingsOpeningLinksScreen {
await this.openingLinksMetaMaskAppOption.isDisplayed();

while (!isMetaMaskLinksButtonDisplayed) {
await Gestures.swipeByPercentage({ x: 50, y: 90 }, { x: 50, y: 5 });
await swipeByPercentage({ x: 50, y: 90 }, { x: 50, y: 5 });
isMetaMaskLinksButtonDisplayed =
await this.openingLinksMetaMaskAppOption.isDisplayed();
}
Expand Down
10 changes: 5 additions & 5 deletions e2e/src/screens/Android/AndroidSettingsScreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { ChainablePromiseArray, ChainablePromiseElement } from 'webdriverio';

import { $$ } from '@wdio/globals';
import Gestures from '@util/Gestures';
import { getSelectorForPlatform } from '@util/Utils';
import { swipeByPercentage } from '@util/gestures';
import { getSelectorForPlatform } from '@util/utils';
import {
IS_RUNNING_IN_BROWSER_STACK,
METAMASK_APP_NAME_ANDROID,
} from '@util/Constants';
import { AndroidSelector } from '@util/Selectors';
} from '@util/constants';
import { AndroidSelector } from '@util/selectors';

class AndroidSettingsScreen {
get metaMaskQALinksButton(): ChainablePromiseElement {
Expand Down Expand Up @@ -114,7 +114,7 @@ class AndroidSettingsScreen {
let isMetaMaskLinksButtonDisplayed =
await this.metaMaskQALinksButton.isDisplayed();
while (!isMetaMaskLinksButtonDisplayed) {
await Gestures.swipeByPercentage({ x: 50, y: 90 }, { x: 50, y: 5 });
await swipeByPercentage({ x: 50, y: 90 }, { x: 50, y: 5 });
isMetaMaskLinksButtonDisplayed =
await this.metaMaskQALinksButton.isDisplayed();
}
Expand Down
6 changes: 3 additions & 3 deletions e2e/src/screens/Android/ChromeBrowserScreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { ChainablePromiseElement } from 'webdriverio';
import { driver } from '@wdio/globals';
import { MobileBrowser } from '@screens/interfaces/MobileBrowser';
import { Dapp } from '@screens/interfaces/Dapp';
import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector } from '@util/Selectors';
import { Browsers } from '@util/Constants';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector } from '@util/selectors';
import { Browsers } from '@util/constants';

class ChromeBrowserScreen implements MobileBrowser {
get urlAddressBar(): ChainablePromiseElement {
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/Android/components/AndroidOpenWithComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChainablePromiseElement } from 'webdriverio';

import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector } from '@util/selectors';

class AndroidOpenWithComponent {
get openWithMetaMaskQA(): ChainablePromiseElement {
Expand Down
13 changes: 5 additions & 8 deletions e2e/src/screens/Dapps/MetaMaskSDKTestDappScreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import { ChainablePromiseElement } from 'webdriverio';

import {
getSelectorForPlatform,
scrollToElement,
getWebViewElementText,
} from '@util/Utils';
import { getSelectorForPlatform, getWebViewElementText } from '@util/utils';
import { swipeToElement } from '@util/gestures';
import { Dapp } from '@screens/interfaces/Dapp';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class MetaMaskSDKTestDappScreen implements Dapp {
private connectionStatusLocator = '[data-testid="connection-status"]';
Expand Down Expand Up @@ -118,12 +115,12 @@ class MetaMaskSDKTestDappScreen implements Dapp {
}

async terminate(): Promise<void> {
await scrollToElement(this.terminateButton);
await swipeToElement(this.terminateButton);
await this.terminateButton.click();
}

async tapPersonalSignButton(): Promise<void> {
await scrollToElement(this.personalSignButton);
await swipeToElement(this.personalSignButton);
await this.personalSignButton.click();
}

Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/GetStartedScreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChainablePromiseElement } from 'webdriverio';
import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class GetStartedScreen {
get getStartedButton(): ChainablePromiseElement {
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/ImportFromSeedScreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChainablePromiseElement } from 'webdriverio';
import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class ImportFromSeedScreen {
get srpInput(): ChainablePromiseElement {
Expand Down
6 changes: 3 additions & 3 deletions e2e/src/screens/MetaMask/LockScreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ChainablePromiseElement } from 'webdriverio';
import { driver } from '@wdio/globals';
import { visibilityOf } from 'wdio-wait-for';
import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';
import MainScreen from '@screens/MetaMask/MainScreen';

class LockScreen {
Expand Down Expand Up @@ -39,7 +39,7 @@ class LockScreen {
'//*[@resource-id="log-in-button"]/android.widget.Button',
),
iosSelector: IOSSelector.by().predicateString(
'label == "UNLOCK" AND name == "UNLOCK"',
'label == "Unlock" AND name == "Unlock"',
),
}),
);
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/MainScreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChainablePromiseElement } from 'webdriverio';
import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class MainScreen {
get networkSwitcher(): ChainablePromiseElement {
Expand Down
8 changes: 4 additions & 4 deletions e2e/src/screens/MetaMask/OptinMetricsScreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ChainablePromiseElement } from 'webdriverio';

import Gestures from '@util/Gestures';
import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { swipeByPercentage } from '@util/gestures';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class OptinMetricsScreen {
get acceptOptinMetrics(): ChainablePromiseElement {
Expand All @@ -18,7 +18,7 @@ class OptinMetricsScreen {

async tapAgreeOptinMetrics(): Promise<void> {
if (!(await this.isAcceptOptinMetricsEnabled())) {
await Gestures.swipeByPercentage({ x: 50, y: 50 }, { x: 50, y: 5 });
await swipeByPercentage({ x: 50, y: 50 }, { x: 50, y: 5 });
}
await this.acceptOptinMetrics.click();
}
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/SecurityUpdates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChainablePromiseElement } from 'webdriverio';

import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class SecurityUpdatesScreen {
get noThanksSecurityUpdates(): ChainablePromiseElement {
Expand Down
10 changes: 5 additions & 5 deletions e2e/src/screens/MetaMask/SettingsScreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ChainablePromiseElement } from 'webdriverio';

import Gestures from '@util/Gestures';
import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { swipeByPercentage } from '@util/gestures';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class SettingsScreen {
get securityAndPrivacyButton(): ChainablePromiseElement {
Expand Down Expand Up @@ -109,8 +109,8 @@ class SettingsScreen {
let isDisplayed = await this.manageConnectionsButton.isDisplayed();
while (!isDisplayed) {
// Swipe down twice
await Gestures.swipeByPercentage({ x: 50, y: 90 }, { x: 50, y: 5 });
await Gestures.swipeByPercentage({ x: 50, y: 60 }, { x: 50, y: 5 });
await swipeByPercentage({ x: 50, y: 90 }, { x: 50, y: 5 });
await swipeByPercentage({ x: 50, y: 60 }, { x: 50, y: 5 });
isDisplayed = await this.manageConnectionsButton.isDisplayed();
}
await this.tapManageConnections();
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/TermsOfUseScreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChainablePromiseElement } from 'webdriverio';

import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class TermsOfUseScreen {
get acceptTermsOfUseCheckbox(): ChainablePromiseElement {
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/WalletReadyScreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChainablePromiseElement } from 'webdriverio';

import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class WalletReadyScreen {
get doneButton(): ChainablePromiseElement {
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/WalletSetupScreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChainablePromiseElement } from 'webdriverio';

import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class WalletSetupScreen {
get importWithSRP(): ChainablePromiseElement {
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/components/BottomNavigationComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChainablePromiseElement } from 'webdriverio';

import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class BottomNavigationComponent {
get settingsButton(): ChainablePromiseElement {
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/components/ConnectModalComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChainablePromiseElement } from 'webdriverio';

import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class ConnectModalComponent {
get accountApprovalModalContainer(): ChainablePromiseElement {
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/components/EnableSmartTransactionsComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChainablePromiseElement } from 'webdriverio';

import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class EnableSmartTransactionsComponent {
private get enableSmartTransactions(): ChainablePromiseElement {
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/components/MetaMetricsComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChainablePromiseElement } from 'webdriverio';

import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class MetaMetricsComponent {
get agreeToMetaMetrics(): ChainablePromiseElement {
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/components/NetworkSwitchedModalComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChainablePromiseElement } from 'webdriverio';

import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class NetworkSwitchedModalComponent {
get gotItButton(): ChainablePromiseElement {
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/components/PersonalSignConfirmationComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChainablePromiseElement } from 'webdriverio';

import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';
import { visibilityOf } from 'wdio-wait-for';

class PersonalSignConfirmationComponent {
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/components/SendTxModalComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChainablePromiseElement } from 'webdriverio';
import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class SendTxModalComponent {
get confirmButton(): ChainablePromiseElement {
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/components/SignModalComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChainablePromiseElement } from 'webdriverio';
import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class SignModalComponent {
get signApprovalButton(): ChainablePromiseElement {
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/components/SwitchNetworkModalComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChainablePromiseElement } from 'webdriverio';
import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class SwitchNetworkModalComponent {
get switchNetworkButton(): ChainablePromiseElement {
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/components/WelcomeComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChainablePromiseElement } from 'webdriverio';
import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class WelcomeComponent {
get noThanksButton(): ChainablePromiseElement {
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/MetaMask/components/WhatsNewComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ChainablePromiseElement } from 'webdriverio';
import { getSelectorForPlatform } from '@util/Utils';
import { AndroidSelector, IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/utils';
import { AndroidSelector, IOSSelector } from '@util/selectors';

class WhatsNewComponent {
get closeModalButton(): ChainablePromiseElement {
Expand Down
6 changes: 3 additions & 3 deletions e2e/src/screens/iOS/SafariBrowserScreen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { ChainablePromiseElement } from 'webdriverio';

import { driver } from '@wdio/globals';
import { getSelectorForPlatform } from '@util/Utils';
import { getSelectorForPlatform } from '@util/utils';
import { MobileBrowser } from '@screens/interfaces/MobileBrowser';
import { IOSSelector } from '@util/Selectors';
import { Browsers } from '@util/Constants';
import { IOSSelector } from '@util/selectors';
import { Browsers } from '@util/constants';
import { Dapp } from '@screens/interfaces/Dapp';

class SafariBrowserScreen implements MobileBrowser {
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/screens/iOS/components/IOSOpenInComponent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ChainablePromiseElement } from 'webdriverio';

import { IOSSelector } from '@util/Selectors';
import { getSelectorForPlatform } from '@util/Utils';
import { IOSSelector } from '@util/selectors';
import { getSelectorForPlatform } from '@util/utils';

class IOSOpenInComponent {
get open(): ChainablePromiseElement {
Expand Down
Loading
Loading