From a50fbbab62c832e6f55aedb9daba1ee4f204c808 Mon Sep 17 00:00:00 2001 From: seaona Date: Mon, 6 Nov 2023 16:03:43 +0100 Subject: [PATCH 1/5] confirmations to smoke tests --- e2e/specs/confirmations/approve-default-erc20.spec.js | 4 ++-- e2e/specs/confirmations/eth-sign.spec.js | 4 ++-- e2e/specs/confirmations/personal-sign.spec.js | 4 ++-- e2e/specs/confirmations/send-erc20-with-dapp.spec.js | 4 ++-- e2e/specs/confirmations/send-erc721.spec.js | 4 ++-- e2e/specs/confirmations/send-eth.spec.js | 4 ++-- e2e/specs/confirmations/typed-sign.spec.js | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/e2e/specs/confirmations/approve-default-erc20.spec.js b/e2e/specs/confirmations/approve-default-erc20.spec.js index 0526f2649a9..ba792ef24bf 100644 --- a/e2e/specs/confirmations/approve-default-erc20.spec.js +++ b/e2e/specs/confirmations/approve-default-erc20.spec.js @@ -1,5 +1,5 @@ 'use strict'; -import { Regression } from '../../tags'; +import { Smoke } from '../../tags'; import TestHelpers from '../../helpers'; import { loginToApp } from '../../viewHelper'; import FixtureBuilder from '../../fixtures/fixture-builder'; @@ -17,7 +17,7 @@ const HST_CONTRACT = SMART_CONTRACTS.HST; const WEBVIEW_TEST_DAPP_APPROVE_TOKENS_BUTTON_ID = 'approveTokens'; const EXPECTED_TOKEN_AMOUNT = '7'; -describe(Regression('ERC20 tokens'), () => { +describe(Smoke('ERC20 tokens'), () => { beforeAll(async () => { jest.setTimeout(170000); if (device.getPlatform() === 'android') { diff --git a/e2e/specs/confirmations/eth-sign.spec.js b/e2e/specs/confirmations/eth-sign.spec.js index e7c16464031..bad5a1c15f4 100644 --- a/e2e/specs/confirmations/eth-sign.spec.js +++ b/e2e/specs/confirmations/eth-sign.spec.js @@ -9,12 +9,12 @@ import { withFixtures, defaultGanacheOptions, } from '../../fixtures/fixture-helper'; -import { Regression } from '../../tags'; +import { Smoke } from '../../tags'; import TestHelpers from '../../helpers'; const MAX_ATTEMPTS = 3; -describe(Regression('Eth Sign'), () => { +describe(Smoke('Eth Sign'), () => { beforeAll(async () => { jest.setTimeout(2500000); await TestHelpers.reverseServerPort(); diff --git a/e2e/specs/confirmations/personal-sign.spec.js b/e2e/specs/confirmations/personal-sign.spec.js index 99c73a67a8e..b075617f62c 100644 --- a/e2e/specs/confirmations/personal-sign.spec.js +++ b/e2e/specs/confirmations/personal-sign.spec.js @@ -9,12 +9,12 @@ import { withFixtures, defaultGanacheOptions, } from '../../fixtures/fixture-helper'; -import { Regression } from '../../tags'; +import { Smoke } from '../../tags'; import TestHelpers from '../../helpers'; const MAX_ATTEMPTS = 3; -describe(Regression('Personal Sign'), () => { +describe(Smoke('Personal Sign'), () => { beforeAll(async () => { jest.setTimeout(2500000); await TestHelpers.reverseServerPort(); diff --git a/e2e/specs/confirmations/send-erc20-with-dapp.spec.js b/e2e/specs/confirmations/send-erc20-with-dapp.spec.js index f2090c86042..6350f77f688 100644 --- a/e2e/specs/confirmations/send-erc20-with-dapp.spec.js +++ b/e2e/specs/confirmations/send-erc20-with-dapp.spec.js @@ -1,5 +1,5 @@ 'use strict'; -import { Regression } from '../../tags'; +import { Smoke } from '../../tags'; import TestHelpers from '../../helpers'; import { loginToApp } from '../../viewHelper'; import FixtureBuilder from '../../fixtures/fixture-builder'; @@ -16,7 +16,7 @@ const HST_CONTRACT = SMART_CONTRACTS.HST; const SENT_TOKENS_MESSAGE_TEXT = root.transactions.sent_tokens; const WEBVIEW_TEST_DAPP_TRANSFER_TOKENS_BUTTON_ID = 'transferTokens'; -describe(Regression('ERC20 tokens'), () => { +describe(Smoke('ERC20 tokens'), () => { beforeAll(async () => { jest.setTimeout(170000); await TestHelpers.reverseServerPort(); diff --git a/e2e/specs/confirmations/send-erc721.spec.js b/e2e/specs/confirmations/send-erc721.spec.js index ca48c87210d..c51bba17675 100644 --- a/e2e/specs/confirmations/send-erc721.spec.js +++ b/e2e/specs/confirmations/send-erc721.spec.js @@ -1,6 +1,6 @@ 'use strict'; -import { Regression } from '../../tags'; +import { Smoke } from '../../tags'; import TestHelpers from '../../helpers'; import { loginToApp } from '../../viewHelper'; import TabBarComponent from '../../pages/TabBarComponent'; @@ -13,7 +13,7 @@ import { import root from '../../../locales/languages/en.json'; import { SMART_CONTRACTS } from '../../../app/util/test/smart-contracts'; -describe(Regression('ERC721 tokens'), () => { +describe(Smoke('ERC721 tokens'), () => { const NFT_CONTRACT = SMART_CONTRACTS.NFTS; const SENT_COLLECTIBLE_MESSAGE_TEXT = root.transactions.sent_collectible; const WEBVIEW_TEST_DAPP_TRANSFER_FROM_BUTTON_ID = 'transferFromButton'; diff --git a/e2e/specs/confirmations/send-eth.spec.js b/e2e/specs/confirmations/send-eth.spec.js index 61d76ab3aac..6c55062dcba 100644 --- a/e2e/specs/confirmations/send-eth.spec.js +++ b/e2e/specs/confirmations/send-eth.spec.js @@ -1,6 +1,6 @@ 'use strict'; -import { Regression } from '../../tags'; +import { Smoke } from '../../tags'; import TestHelpers from '../../helpers'; import AmountView from '../../pages/AmountView'; @@ -17,7 +17,7 @@ import { } from '../../fixtures/fixture-helper'; import { SMART_CONTRACTS } from '../../../app/util/test/smart-contracts'; -describe(Regression('Send ETH'), () => { +describe(Smoke('Send ETH'), () => { const TOKEN_NAME = root.unit.eth; const AMOUNT = '0.12345'; diff --git a/e2e/specs/confirmations/typed-sign.spec.js b/e2e/specs/confirmations/typed-sign.spec.js index 4f0968a8b9b..a165825b4a2 100644 --- a/e2e/specs/confirmations/typed-sign.spec.js +++ b/e2e/specs/confirmations/typed-sign.spec.js @@ -9,12 +9,12 @@ import { withFixtures, defaultGanacheOptions, } from '../../fixtures/fixture-helper'; -import { Regression } from '../../tags'; +import { Smoke } from '../../tags'; import TestHelpers from '../../helpers'; const MAX_ATTEMPTS = 3; -describe(Regression('Typed Sign'), () => { +describe(Smoke('Typed Sign'), () => { beforeAll(async () => { jest.setTimeout(2500000); await TestHelpers.reverseServerPort(); From 5207ece0a486eb1dd97a307e50f77e11eceec697 Mon Sep 17 00:00:00 2001 From: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com> Date: Tue, 14 Nov 2023 20:29:42 +0000 Subject: [PATCH 2/5] Fix E2E confirmation flakiness and object not extensible (#7802) --- app/components/UI/TransactionReview/index.js | 2 +- bitrise.yml | 2 +- e2e/fixtures/utils.js | 10 +++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/components/UI/TransactionReview/index.js b/app/components/UI/TransactionReview/index.js index a82fb561964..9eeeac9f400 100644 --- a/app/components/UI/TransactionReview/index.js +++ b/app/components/UI/TransactionReview/index.js @@ -185,7 +185,7 @@ class TransactionReview extends PureComponent { /** * Error blockaid transaction execution, undefined value signifies no error. */ - error: PropTypes.oneOf[(PropTypes.bool, PropTypes.string)], + error: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]), /** * Whether or not basic gas estimates have been fetched */ diff --git a/bitrise.yml b/bitrise.yml index 105699cb1b8..24d5bb7deb8 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -138,7 +138,7 @@ workflows: asdf global nodejs 18.18 asdf plugin add yarn asdf list all yarn - asdf install yarn latest + asdf install yarn 1.22.19 asdf global yarn 1.22.19 title: Install node and yarn - yarn@0: diff --git a/e2e/fixtures/utils.js b/e2e/fixtures/utils.js index 86b91e2c5b9..16493de98e0 100644 --- a/e2e/fixtures/utils.js +++ b/e2e/fixtures/utils.js @@ -2,9 +2,17 @@ import { DEFAULT_GANACHE_PORT } from '../../app/util/test/ganache'; import { DEFAULT_FIXTURE_SERVER_PORT } from './fixture-server'; import { DEFAULT_DAPP_SERVER_PORT } from './fixture-helper'; +function transformToValidPort(defaultPort, pid) { + // Improve uniqueness by using a simple transformation + const transformedPort = (parseInt(pid, 10) % 100000) + defaultPort; + + // Ensure the transformed port falls within the valid port range (0-65535) + return transformedPort % 65536; +} + function getServerPort(defaultPort) { if (process.env.CI) { - return defaultPort + (parseInt(process.pid, 10) % 10); + return transformToValidPort(defaultPort, process.pid); } return defaultPort; } From b6fa0b81a71468d49c11e2685dbddd77631ac872 Mon Sep 17 00:00:00 2001 From: seaona Date: Thu, 23 Nov 2023 15:18:27 +0100 Subject: [PATCH 3/5] split signatures to benefit from parallelization --- e2e/specs/confirmations/typed-sign-v3.spec.js | 76 ++++++++++++ e2e/specs/confirmations/typed-sign-v4.spec.js | 76 ++++++++++++ e2e/specs/confirmations/typed-sign.spec.js | 108 ------------------ 3 files changed, 152 insertions(+), 108 deletions(-) create mode 100644 e2e/specs/confirmations/typed-sign-v3.spec.js create mode 100644 e2e/specs/confirmations/typed-sign-v4.spec.js diff --git a/e2e/specs/confirmations/typed-sign-v3.spec.js b/e2e/specs/confirmations/typed-sign-v3.spec.js new file mode 100644 index 00000000000..763cbfda6d8 --- /dev/null +++ b/e2e/specs/confirmations/typed-sign-v3.spec.js @@ -0,0 +1,76 @@ +'use strict'; +import Browser from '../../pages/Drawer/Browser'; +import TabBarComponent from '../../pages/TabBarComponent'; +import { loginToApp } from '../../viewHelper'; +import SigningModal from '../../pages/modals/SigningModal'; +import { TestDApp } from '../../pages/TestDApp'; +import FixtureBuilder from '../../fixtures/fixture-builder'; +import { + withFixtures, + defaultGanacheOptions, +} from '../../fixtures/fixture-helper'; +import { Smoke } from '../../tags'; +import TestHelpers from '../../helpers'; + +const MAX_ATTEMPTS = 3; + +describe(Smoke('Typed Sign V3'), () => { + beforeAll(async () => { + jest.setTimeout(2500000); + await TestHelpers.reverseServerPort(); + }); + + it('should sign typed V3 message', async () => { + await withFixtures( + { + dapp: true, + fixture: new FixtureBuilder() + .withGanacheNetwork() + .withPermissionControllerConnectedToTestDapp() + .build(), + restartDevice: true, + ganacheOptions: defaultGanacheOptions, + }, + async () => { + await loginToApp(); + + await TabBarComponent.tapBrowser(); + await Browser.navigateToTestDApp(); + + await TestHelpers.retry(MAX_ATTEMPTS, async () => { + await TestDApp.tapTypedV3SignButton(); + await SigningModal.isTypedRequestVisible(); + await SigningModal.tapSignButton(); + await SigningModal.isNotVisible(); + }); + }, + ); + }); + + it('should cancel typed V3 message', async () => { + await withFixtures( + { + dapp: true, + fixture: new FixtureBuilder() + .withGanacheNetwork() + .withPermissionControllerConnectedToTestDapp() + .build(), + restartDevice: true, + ganacheOptions: defaultGanacheOptions, + }, + async () => { + await loginToApp(); + + await TabBarComponent.tapBrowser(); + await Browser.navigateToTestDApp(); + + await TestHelpers.retry(MAX_ATTEMPTS, async () => { + await TestDApp.tapTypedV3SignButton(); + await SigningModal.isTypedRequestVisible(); + await SigningModal.tapSignButton(); + await SigningModal.isNotVisible(); + }); + }, + ); + }); +}); diff --git a/e2e/specs/confirmations/typed-sign-v4.spec.js b/e2e/specs/confirmations/typed-sign-v4.spec.js new file mode 100644 index 00000000000..308bc6460ce --- /dev/null +++ b/e2e/specs/confirmations/typed-sign-v4.spec.js @@ -0,0 +1,76 @@ +'use strict'; +import Browser from '../../pages/Drawer/Browser'; +import TabBarComponent from '../../pages/TabBarComponent'; +import { loginToApp } from '../../viewHelper'; +import SigningModal from '../../pages/modals/SigningModal'; +import { TestDApp } from '../../pages/TestDApp'; +import FixtureBuilder from '../../fixtures/fixture-builder'; +import { + withFixtures, + defaultGanacheOptions, +} from '../../fixtures/fixture-helper'; +import { Smoke } from '../../tags'; +import TestHelpers from '../../helpers'; + +const MAX_ATTEMPTS = 3; + +describe(Smoke('Typed Sign V4'), () => { + beforeAll(async () => { + jest.setTimeout(2500000); + await TestHelpers.reverseServerPort(); + }); + + it('should sign typed V4 message', async () => { + await withFixtures( + { + dapp: true, + fixture: new FixtureBuilder() + .withGanacheNetwork() + .withPermissionControllerConnectedToTestDapp() + .build(), + restartDevice: true, + ganacheOptions: defaultGanacheOptions, + }, + async () => { + await loginToApp(); + + await TabBarComponent.tapBrowser(); + await Browser.navigateToTestDApp(); + + await TestHelpers.retry(MAX_ATTEMPTS, async () => { + await TestDApp.tapTypedV4SignButton(); + await SigningModal.isTypedRequestVisible(); + await SigningModal.tapSignButton(); + await SigningModal.isNotVisible(); + }); + }, + ); + }); + + it('should cancel typed V4 message', async () => { + await withFixtures( + { + dapp: true, + fixture: new FixtureBuilder() + .withGanacheNetwork() + .withPermissionControllerConnectedToTestDapp() + .build(), + restartDevice: true, + ganacheOptions: defaultGanacheOptions, + }, + async () => { + await loginToApp(); + + await TabBarComponent.tapBrowser(); + await Browser.navigateToTestDApp(); + + await TestHelpers.retry(MAX_ATTEMPTS, async () => { + await TestDApp.tapTypedV4SignButton(); + await SigningModal.isTypedRequestVisible(); + await SigningModal.tapCancelButton(); + await SigningModal.isNotVisible(); + }); + }, + ); + }); +}); diff --git a/e2e/specs/confirmations/typed-sign.spec.js b/e2e/specs/confirmations/typed-sign.spec.js index a165825b4a2..4f76c904cbf 100644 --- a/e2e/specs/confirmations/typed-sign.spec.js +++ b/e2e/specs/confirmations/typed-sign.spec.js @@ -73,112 +73,4 @@ describe(Smoke('Typed Sign'), () => { }, ); }); - - it('should sign typed V3 message', async () => { - await withFixtures( - { - dapp: true, - fixture: new FixtureBuilder() - .withGanacheNetwork() - .withPermissionControllerConnectedToTestDapp() - .build(), - restartDevice: true, - ganacheOptions: defaultGanacheOptions, - }, - async () => { - await loginToApp(); - - await TabBarComponent.tapBrowser(); - await Browser.navigateToTestDApp(); - - await TestHelpers.retry(MAX_ATTEMPTS, async () => { - await TestDApp.tapTypedV3SignButton(); - await SigningModal.isTypedRequestVisible(); - await SigningModal.tapSignButton(); - await SigningModal.isNotVisible(); - }); - }, - ); - }); - - it('should cancel typed V3 message', async () => { - await withFixtures( - { - dapp: true, - fixture: new FixtureBuilder() - .withGanacheNetwork() - .withPermissionControllerConnectedToTestDapp() - .build(), - restartDevice: true, - ganacheOptions: defaultGanacheOptions, - }, - async () => { - await loginToApp(); - - await TabBarComponent.tapBrowser(); - await Browser.navigateToTestDApp(); - - await TestHelpers.retry(MAX_ATTEMPTS, async () => { - await TestDApp.tapTypedV3SignButton(); - await SigningModal.isTypedRequestVisible(); - await SigningModal.tapSignButton(); - await SigningModal.isNotVisible(); - }); - }, - ); - }); - - it('should sign typed V4 message', async () => { - await withFixtures( - { - dapp: true, - fixture: new FixtureBuilder() - .withGanacheNetwork() - .withPermissionControllerConnectedToTestDapp() - .build(), - restartDevice: true, - ganacheOptions: defaultGanacheOptions, - }, - async () => { - await loginToApp(); - - await TabBarComponent.tapBrowser(); - await Browser.navigateToTestDApp(); - - await TestHelpers.retry(MAX_ATTEMPTS, async () => { - await TestDApp.tapTypedV4SignButton(); - await SigningModal.isTypedRequestVisible(); - await SigningModal.tapSignButton(); - await SigningModal.isNotVisible(); - }); - }, - ); - }); - - it('should cancel typed V4 message', async () => { - await withFixtures( - { - dapp: true, - fixture: new FixtureBuilder() - .withGanacheNetwork() - .withPermissionControllerConnectedToTestDapp() - .build(), - restartDevice: true, - ganacheOptions: defaultGanacheOptions, - }, - async () => { - await loginToApp(); - - await TabBarComponent.tapBrowser(); - await Browser.navigateToTestDApp(); - - await TestHelpers.retry(MAX_ATTEMPTS, async () => { - await TestDApp.tapTypedV4SignButton(); - await SigningModal.isTypedRequestVisible(); - await SigningModal.tapCancelButton(); - await SigningModal.isNotVisible(); - }); - }, - ); - }); }); From c7c7d18c184961302a561180fd93882e08d66f26 Mon Sep 17 00:00:00 2001 From: seaona Date: Mon, 4 Dec 2023 08:21:49 +0100 Subject: [PATCH 4/5] move signatures to a new dedicated folder --- .../{ => signatures}/eth-sign.spec.js | 18 +++++++++--------- .../{ => signatures}/personal-sign.spec.js | 18 +++++++++--------- .../{ => signatures}/typed-sign-v3.spec.js | 18 +++++++++--------- .../{ => signatures}/typed-sign-v4.spec.js | 18 +++++++++--------- .../{ => signatures}/typed-sign.spec.js | 18 +++++++++--------- 5 files changed, 45 insertions(+), 45 deletions(-) rename e2e/specs/confirmations/{ => signatures}/eth-sign.spec.js (81%) rename e2e/specs/confirmations/{ => signatures}/personal-sign.spec.js (79%) rename e2e/specs/confirmations/{ => signatures}/typed-sign-v3.spec.js (78%) rename e2e/specs/confirmations/{ => signatures}/typed-sign-v4.spec.js (78%) rename e2e/specs/confirmations/{ => signatures}/typed-sign.spec.js (78%) diff --git a/e2e/specs/confirmations/eth-sign.spec.js b/e2e/specs/confirmations/signatures/eth-sign.spec.js similarity index 81% rename from e2e/specs/confirmations/eth-sign.spec.js rename to e2e/specs/confirmations/signatures/eth-sign.spec.js index bad5a1c15f4..c9fbcb9a9c8 100644 --- a/e2e/specs/confirmations/eth-sign.spec.js +++ b/e2e/specs/confirmations/signatures/eth-sign.spec.js @@ -1,16 +1,16 @@ 'use strict'; -import Browser from '../../pages/Drawer/Browser'; -import TabBarComponent from '../../pages/TabBarComponent'; -import { loginToApp } from '../../viewHelper'; -import SigningModal from '../../pages/modals/SigningModal'; -import { TestDApp } from '../../pages/TestDApp'; -import FixtureBuilder from '../../fixtures/fixture-builder'; +import Browser from '../../../pages/Drawer/Browser'; +import TabBarComponent from '../../../pages/TabBarComponent'; +import { loginToApp } from '../../../viewHelper'; +import SigningModal from '../../../pages/modals/SigningModal'; +import { TestDApp } from '../../../pages/TestDApp'; +import FixtureBuilder from '../../../fixtures/fixture-builder'; import { withFixtures, defaultGanacheOptions, -} from '../../fixtures/fixture-helper'; -import { Smoke } from '../../tags'; -import TestHelpers from '../../helpers'; +} from '../../../fixtures/fixture-helper'; +import { Smoke } from '../../../tags'; +import TestHelpers from '../../../helpers'; const MAX_ATTEMPTS = 3; diff --git a/e2e/specs/confirmations/personal-sign.spec.js b/e2e/specs/confirmations/signatures/personal-sign.spec.js similarity index 79% rename from e2e/specs/confirmations/personal-sign.spec.js rename to e2e/specs/confirmations/signatures/personal-sign.spec.js index b075617f62c..15530ce0862 100644 --- a/e2e/specs/confirmations/personal-sign.spec.js +++ b/e2e/specs/confirmations/signatures/personal-sign.spec.js @@ -1,16 +1,16 @@ 'use strict'; -import Browser from '../../pages/Drawer/Browser'; -import TabBarComponent from '../../pages/TabBarComponent'; -import { loginToApp } from '../../viewHelper'; -import SigningModal from '../../pages/modals/SigningModal'; -import { TestDApp } from '../../pages/TestDApp'; -import FixtureBuilder from '../../fixtures/fixture-builder'; +import Browser from '../../../pages/Drawer/Browser'; +import TabBarComponent from '../../../pages/TabBarComponent'; +import { loginToApp } from '../../../viewHelper'; +import SigningModal from '../../../pages/modals/SigningModal'; +import { TestDApp } from '../../../pages/TestDApp'; +import FixtureBuilder from '../../../fixtures/fixture-builder'; import { withFixtures, defaultGanacheOptions, -} from '../../fixtures/fixture-helper'; -import { Smoke } from '../../tags'; -import TestHelpers from '../../helpers'; +} from '../../../fixtures/fixture-helper'; +import { Smoke } from '../../../tags'; +import TestHelpers from '../../../helpers'; const MAX_ATTEMPTS = 3; diff --git a/e2e/specs/confirmations/typed-sign-v3.spec.js b/e2e/specs/confirmations/signatures/typed-sign-v3.spec.js similarity index 78% rename from e2e/specs/confirmations/typed-sign-v3.spec.js rename to e2e/specs/confirmations/signatures/typed-sign-v3.spec.js index 763cbfda6d8..fe225d432dd 100644 --- a/e2e/specs/confirmations/typed-sign-v3.spec.js +++ b/e2e/specs/confirmations/signatures/typed-sign-v3.spec.js @@ -1,16 +1,16 @@ 'use strict'; -import Browser from '../../pages/Drawer/Browser'; -import TabBarComponent from '../../pages/TabBarComponent'; -import { loginToApp } from '../../viewHelper'; -import SigningModal from '../../pages/modals/SigningModal'; -import { TestDApp } from '../../pages/TestDApp'; -import FixtureBuilder from '../../fixtures/fixture-builder'; +import Browser from '../../../pages/Drawer/Browser'; +import TabBarComponent from '../../../pages/TabBarComponent'; +import { loginToApp } from '../../../viewHelper'; +import SigningModal from '../../../pages/modals/SigningModal'; +import { TestDApp } from '../../../pages/TestDApp'; +import FixtureBuilder from '../../../fixtures/fixture-builder'; import { withFixtures, defaultGanacheOptions, -} from '../../fixtures/fixture-helper'; -import { Smoke } from '../../tags'; -import TestHelpers from '../../helpers'; +} from '../../../fixtures/fixture-helper'; +import { Smoke } from '../../../tags'; +import TestHelpers from '../../../helpers'; const MAX_ATTEMPTS = 3; diff --git a/e2e/specs/confirmations/typed-sign-v4.spec.js b/e2e/specs/confirmations/signatures/typed-sign-v4.spec.js similarity index 78% rename from e2e/specs/confirmations/typed-sign-v4.spec.js rename to e2e/specs/confirmations/signatures/typed-sign-v4.spec.js index 308bc6460ce..c68b9e890d8 100644 --- a/e2e/specs/confirmations/typed-sign-v4.spec.js +++ b/e2e/specs/confirmations/signatures/typed-sign-v4.spec.js @@ -1,16 +1,16 @@ 'use strict'; -import Browser from '../../pages/Drawer/Browser'; -import TabBarComponent from '../../pages/TabBarComponent'; -import { loginToApp } from '../../viewHelper'; -import SigningModal from '../../pages/modals/SigningModal'; -import { TestDApp } from '../../pages/TestDApp'; -import FixtureBuilder from '../../fixtures/fixture-builder'; +import Browser from '../../../pages/Drawer/Browser'; +import TabBarComponent from '../../../pages/TabBarComponent'; +import { loginToApp } from '../../../viewHelper'; +import SigningModal from '../../../pages/modals/SigningModal'; +import { TestDApp } from '../../../pages/TestDApp'; +import FixtureBuilder from '../../../fixtures/fixture-builder'; import { withFixtures, defaultGanacheOptions, -} from '../../fixtures/fixture-helper'; -import { Smoke } from '../../tags'; -import TestHelpers from '../../helpers'; +} from '../../../fixtures/fixture-helper'; +import { Smoke } from '../../../tags'; +import TestHelpers from '../../../helpers'; const MAX_ATTEMPTS = 3; diff --git a/e2e/specs/confirmations/typed-sign.spec.js b/e2e/specs/confirmations/signatures/typed-sign.spec.js similarity index 78% rename from e2e/specs/confirmations/typed-sign.spec.js rename to e2e/specs/confirmations/signatures/typed-sign.spec.js index 4f76c904cbf..9cb207055ad 100644 --- a/e2e/specs/confirmations/typed-sign.spec.js +++ b/e2e/specs/confirmations/signatures/typed-sign.spec.js @@ -1,16 +1,16 @@ 'use strict'; -import Browser from '../../pages/Drawer/Browser'; -import TabBarComponent from '../../pages/TabBarComponent'; -import { loginToApp } from '../../viewHelper'; -import SigningModal from '../../pages/modals/SigningModal'; -import { TestDApp } from '../../pages/TestDApp'; -import FixtureBuilder from '../../fixtures/fixture-builder'; +import Browser from '../../../pages/Drawer/Browser'; +import TabBarComponent from '../../../pages/TabBarComponent'; +import { loginToApp } from '../../../viewHelper'; +import SigningModal from '../../../pages/modals/SigningModal'; +import { TestDApp } from '../../../pages/TestDApp'; +import FixtureBuilder from '../../../fixtures/fixture-builder'; import { withFixtures, defaultGanacheOptions, -} from '../../fixtures/fixture-helper'; -import { Smoke } from '../../tags'; -import TestHelpers from '../../helpers'; +} from '../../../fixtures/fixture-helper'; +import { Smoke } from '../../../tags'; +import TestHelpers from '../../../helpers'; const MAX_ATTEMPTS = 3; From 4ac5b4129776c3961116dd03935e4be7d90e3d46 Mon Sep 17 00:00:00 2001 From: seaona Date: Mon, 4 Dec 2023 09:21:09 +0100 Subject: [PATCH 5/5] add signatures path to jest runner --- e2e/jest.e2e.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e/jest.e2e.config.js b/e2e/jest.e2e.config.js index 9c6c27b4f40..d6883952403 100644 --- a/e2e/jest.e2e.config.js +++ b/e2e/jest.e2e.config.js @@ -5,6 +5,7 @@ module.exports = { testMatch: [ '/e2e/specs/*.spec.js', '/e2e/specs/*/*.spec.js', + '/e2e/specs/*/*/*.spec.js', ], testTimeout: 220000, maxWorkers: process.env.CI ? 3 : 1,