test: Reorganize e2e tests repo part2

app/scripts/metamask-controller.actions.test.js

@@ -14,7 +14,7 @@ import { PermissionsRequestNotFoundError } from '@metamask/permission-controller
 import nock from 'nock';
 import mockEncryptor from '../../test/lib/mock-encryptor';
 
-const { Ganache } = require('../../test/e2e/ganache');
+const { Ganache } = require('../../test/e2e/seeder/ganache');
 
 const ganacheServer = new Ganache();
 

app/scripts/metamask-controller.test.js

@@ -31,7 +31,7 @@ import { flushPromises } from '../../test/lib/timer-helpers';
 import { deferredPromise } from './lib/util';
 import MetaMaskController from './metamask-controller';
 
-const { Ganache } = require('../../test/e2e/ganache');
+const { Ganache } = require('../../test/e2e/seeder/ganache');
 
 const ganacheServer = new Ganache();
 

test/e2e/helpers.js

@@ -8,7 +8,7 @@ const { difference } = require('lodash');
 const createStaticServer = require('../../development/create-static-server');
 const { tEn } = require('../lib/i18n-helpers');
 const { setupMocking } = require('./mock-e2e');
-const { Ganache } = require('./ganache');
+const { Ganache } = require('./seeder/ganache');
 const FixtureServer = require('./fixture-server');
 const PhishingWarningPageServer = require('./phishing-warning-page-server');
 const { buildWebDriver } = require('./webdriver');

test/e2e/tests/incremental-security.spec.js → test/e2e/tests/account/incremental-security.spec.js

@@ -1,6 +1,6 @@
 const { strict: assert } = require('assert');
-const { convertToHexValue, withFixtures, openDapp } = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+const { convertToHexValue, withFixtures, openDapp } = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 const WALLET_PASSWORD = 'correct horse battery staple';
 

test/e2e/tests/lock-account.spec.js → test/e2e/tests/account/lock-account.spec.js

@@ -3,8 +3,8 @@ const {
   defaultGanacheOptions,
   withFixtures,
   unlockWallet,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Lock and unlock', function () {
   it('successfully unlocks after lock', async function () {

test/e2e/tests/lockdown.spec.js → test/e2e/tests/account/lockdown.spec.js

@@ -3,10 +3,10 @@ const { Browser } = require('selenium-webdriver');
 const {
   getGlobalProperties,
   testIntrinsic,
-} = require('../../helpers/protect-intrinsics-helpers');
-const { convertToHexValue, withFixtures } = require('../helpers');
-const { PAGES } = require('../webdriver/driver');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../../helpers/protect-intrinsics-helpers');
+const { convertToHexValue, withFixtures } = require('../../helpers');
+const { PAGES } = require('../../webdriver/driver');
+const FixtureBuilder = require('../../fixture-builder');
 
 const isFirefox = process.env.SELENIUM_BROWSER === Browser.FIREFOX;
 

test/e2e/tests/metamask-responsive-ui.spec.js → test/e2e/tests/account/metamask-responsive-ui.spec.js

@@ -6,8 +6,8 @@ const {
   locateAccountBalanceDOM,
   openActionMenuAndStartSendFlow,
   unlockWallet,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('MetaMask Responsive UI', function () {
   it('Creating a new wallet @no-mmi', async function () {

test/e2e/tests/migrate-old-vault.spec.js → test/e2e/tests/account/migrate-old-vault.spec.js

@@ -1,6 +1,6 @@
 const { strict: assert } = require('assert');
-const { defaultGanacheOptions, withFixtures } = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+const { defaultGanacheOptions, withFixtures } = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 const lock = async (driver) => {
   await driver.clickElement('[data-testid="account-options-menu-button"]');

test/e2e/tests/contract-interactions.spec.js → test/e2e/tests/dapp-interactions/contract-interactions.spec.js

@@ -6,10 +6,10 @@ const {
   largeDelayMs,
   WINDOW_TITLES,
   locateAccountBalanceDOM,
-} = require('../helpers');
+} = require('../../helpers');
 
-const { SMART_CONTRACTS } = require('../seeder/smart-contracts');
-const FixtureBuilder = require('../fixture-builder');
+const { SMART_CONTRACTS } = require('../../seeder/smart-contracts');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Deploy contract and call contract methods', function () {
   const smartContract = SMART_CONTRACTS.PIGGYBANK;

test/e2e/tests/encrypt-decrypt.spec.js → test/e2e/tests/dapp-interactions/encrypt-decrypt.spec.js

@@ -5,8 +5,8 @@ const {
   openDapp,
   unlockWallet,
   WINDOW_TITLES,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 async function validateEncryptionKey(driver, encryptionKey) {
   await driver.clickElement('#getEncryptionKeyButton');

test/e2e/tests/eth-subscribe.spec.js → test/e2e/tests/dapp-interactions/eth-subscribe.spec.js

@@ -4,8 +4,8 @@ const {
   openDapp,
   DAPP_ONE_URL,
   unlockWallet,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('eth_subscribe', function () {
   it('only broadcasts subscription notifications on the page that registered the subscription', async function () {

test/e2e/tests/failing-contract.spec.js → test/e2e/tests/dapp-interactions/failing-contract.spec.js

@@ -5,9 +5,9 @@ const {
   unlockWallet,
   WINDOW_TITLES,
   generateGanacheOptions,
-} = require('../helpers');
-const { SMART_CONTRACTS } = require('../seeder/smart-contracts');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const { SMART_CONTRACTS } = require('../../seeder/smart-contracts');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Failing contract interaction ', function () {
   const smartContract = SMART_CONTRACTS.FAILING;

test/e2e/tests/provider-api.spec.js → test/e2e/tests/dapp-interactions/provider-api.spec.js

@@ -5,8 +5,8 @@ const {
   withFixtures,
   openDapp,
   unlockWallet,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('MetaMask', function () {
   it('provider should inform dapp when switching networks', async function () {

test/e2e/tests/signin-with-ethereum.spec.js → test/e2e/tests/dapp-interactions/signin-with-ethereum.spec.js

@@ -6,8 +6,8 @@ const {
   DAPP_URL,
   unlockWallet,
   WINDOW_TITLES,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Sign in with ethereum', function () {
   it('user should be able to confirm sign in with ethereum', async function () {

test/e2e/tests/errors.spec.js → test/e2e/tests/metrics/errors.spec.js

@@ -5,9 +5,9 @@ const { get, has, set, unset, cloneDeep } = require('lodash');
 const { Browser } = require('selenium-webdriver');
 const { format } = require('prettier');
 const { isObject } = require('@metamask/utils');
-const { SENTRY_UI_STATE } = require('../../../app/scripts/lib/setupSentry');
-const FixtureBuilder = require('../fixture-builder');
-const { convertToHexValue, withFixtures } = require('../helpers');
+const { SENTRY_UI_STATE } = require('../../../../app/scripts/lib/setupSentry');
+const FixtureBuilder = require('../../fixture-builder');
+const { convertToHexValue, withFixtures } = require('../../helpers');
 
 /**
  * Derive a UI state field from a background state field.

test/e2e/tests/metrics/swaps.spec.js

@@ -29,7 +29,7 @@ const {
   FEATURE_FLAGS_API_MOCK_RESULT,
   TRADES_API_MOCK_RESULT,
   NETWORKS_2_API_MOCK_RESULT,
-} = require('./mock-data');
+} = require('../../../data/mock-data');
 
 const numberOfSegmentRequests = 19;
 

test/e2e/tests/custom-rpc-history.spec.js → test/e2e/tests/network/custom-rpc-history.spec.js

@@ -5,8 +5,8 @@ const {
   withFixtures,
   regularDelayMs,
   unlockWallet,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Custom RPC history', function () {
   it(`creates first custom RPC entry`, async function () {

test/e2e/tests/phishing-controller/phishing-detection.spec.js

@@ -76,7 +76,7 @@ describe('Phishing Detection', function () {
           });
         },
         dapp: true,
-        dappPaths: ['mock-page-with-iframe'],
+        dappPaths: ['./tests/phishing-controller/mock-page-with-iframe'],
         dappOptions: {
           numberOfDapps: 2,
         },
@@ -114,7 +114,9 @@ describe('Phishing Detection', function () {
           });
         },
         dapp: true,
-        dappPaths: ['mock-page-with-disallowed-iframe'],
+        dappPaths: [
+          './tests/phishing-controller/mock-page-with-disallowed-iframe',
+        ],
         dappOptions: {
           numberOfDapps: 2,
         },
@@ -263,7 +265,9 @@ describe('Phishing Detection', function () {
           });
         },
         dapp: true,
-        dappPaths: ['mock-page-with-disallowed-iframe'],
+        dappPaths: [
+          './tests/phishing-controller/mock-page-with-disallowed-iframe',
+        ],
         dappOptions: {
           numberOfDapps: 2,
         },

test/e2e/mock-server-json-rpc.ts → test/e2e/tests/ppom/mocks/mock-server-json-rpc.ts

@@ -1,5 +1,5 @@
 import { MockttpServer } from 'mockttp';
-import { mockJsonRpcResult } from '../mocks/json-rpc-result';
+import { mockJsonRpcResult } from './json-rpc-result';
 
 type RequestConfig = [
   method: string,

test/e2e/tests/ppom/ppom-blockaid-alert-erc20-approval.spec.js

@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
-const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 
 const {
   WINDOW_TITLES,
@@ -9,6 +8,7 @@ const {
   unlockWallet,
   withFixtures,
 } = require('../../helpers');
+const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
 

test/e2e/tests/ppom/ppom-blockaid-alert-erc20-transfer.spec.js

@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
-const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 
 const {
   WINDOW_TITLES,
@@ -9,6 +8,7 @@ const {
   unlockWallet,
   withFixtures,
 } = require('../../helpers');
+const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
 

test/e2e/tests/ppom/ppom-blockaid-alert-metrics.spec.js

@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
-const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 const {
   WINDOW_TITLES,
   defaultGanacheOptions,
@@ -10,6 +9,7 @@ const {
   getEventPayloads,
   switchToNotificationWindow,
 } = require('../../helpers');
+const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 const selectedAddress = '0x5cfe73b6021e818b776b421b1c4db2474086a7e1';
 const selectedAddressWithoutPrefix = '5cfe73b6021e818b776b421b1c4db2474086a7e1';

test/e2e/tests/ppom/ppom-blockaid-alert-networks-support.spec.js

@@ -1,13 +1,13 @@
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
-const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 const {
   WINDOW_TITLES,
   defaultGanacheOptions,
   openDapp,
   unlockWallet,
   withFixtures,
 } = require('../../helpers');
+const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 async function mockInfura(mockServer) {
   await mockServerJsonRpc(mockServer, [

test/e2e/tests/ppom/ppom-blockaid-alert-simple-send.spec.js

@@ -1,13 +1,13 @@
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
-const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 
 const {
   defaultGanacheOptions,
   withFixtures,
   sendScreenToConfirmScreen,
   unlockWallet,
 } = require('../../helpers');
+const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
 const mockMaliciousAddress = '0x5fbdb2315678afecb367f032d93f642f64180aa3';

test/e2e/tests/ppom/ppom-blockaid-alert-trade-order-farming.spec.js

@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
-const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 
 const {
   WINDOW_TITLES,
@@ -9,6 +8,7 @@ const {
   unlockWallet,
   withFixtures,
 } = require('../../helpers');
+const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
 

test/e2e/tests/ppom/ppom-blockaid-alert.spec.js

@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
-const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 
 const {
   WINDOW_TITLES,
@@ -10,6 +9,7 @@ const {
   withFixtures,
   switchToNotificationWindow,
 } = require('../../helpers');
+const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
 const selectedAddress = '0x5cfe73b6021e818b776b421b1c4db2474086a7e1';

test/e2e/tests/ppom/ppom-blockaid-setApprovalForAll-farming.spec.js

@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const FixtureBuilder = require('../../fixture-builder');
-const { mockServerJsonRpc } = require('../../mock-server-json-rpc');
 
 const {
   WINDOW_TITLES,
@@ -9,6 +8,7 @@ const {
   unlockWallet,
   withFixtures,
 } = require('../../helpers');
+const { mockServerJsonRpc } = require('./mocks/mock-server-json-rpc');
 
 const bannerAlertSelector = '[data-testid="security-provider-banner-alert"]';
 

test/e2e/tests/localization.spec.js → test/e2e/tests/settings/localization.spec.js

@@ -3,8 +3,8 @@ const {
   defaultGanacheOptions,
   withFixtures,
   unlockWallet,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Localization', function () {
   it('can correctly display Philippine peso symbol and code', async function () {

test/e2e/tests/settings-security-reveal-srp.spec.js → test/e2e/tests/settings/settings-security-reveal-srp.spec.js

@@ -5,9 +5,9 @@ const {
   completeSRPRevealQuiz,
   tapAndHoldToRevealSRP,
   closeSRPReveal,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
-const { tEn } = require('../../lib/i18n-helpers');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
+const { tEn } = require('../../../lib/i18n-helpers');
 
 describe('Reveal SRP through settings', function () {
   const testPassword = 'correct horse battery staple';

test/e2e/tests/terms-of-use.spec.js → test/e2e/tests/settings/terms-of-use.spec.js

@@ -3,8 +3,8 @@ const {
   defaultGanacheOptions,
   withFixtures,
   unlockWallet,
-} = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
+} = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
 
 describe('Terms of use', function () {
   it('accepts the updated terms of use @no-mmi', async function () {

test/e2e/synchronous-injection/synchronous-injection.spec.js → test/e2e/tests/synchronous-injection/synchronous-injection.spec.js

@@ -1,7 +1,7 @@
 const { strict: assert } = require('assert');
-const { withFixtures, unlockWallet, openDapp } = require('../helpers');
-const FixtureBuilder = require('../fixture-builder');
-const createStaticServer = require('../../../development/create-static-server');
+const { withFixtures, unlockWallet, openDapp } = require('../../helpers');
+const FixtureBuilder = require('../../fixture-builder');
+const createStaticServer = require('../../../../development/create-static-server');
 
 const dappPort = 8080;