diff --git a/bitrise.yml b/bitrise.yml index 44878376bba..4369855235f 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -71,10 +71,14 @@ pipelines: stages: - create_build_qa_android: {} - app_upgrade_test_stage: {} - multichain_e2e_pipeline: + multichain_permissions_e2e_pipeline: stages: - - build_multichain_e2e_ios_android_stage: {} - - run_multichain_e2e_ios_android_stage: {} + - build_multichain_permissions_e2e_ios_android_stage: {} + - run_multichain_permissions_e2e_ios_android_stage: {} + multichain_assets_e2e_pipeline: + stages: + - build_multichain_assets_e2e_ios_android_stage: {} + - run_multichain_assets_e2e_ios_android_stage: {} # Pipeline for Flask create_flask_release_builds_pipeline: stages: @@ -140,15 +144,24 @@ stages: workflows: - ios_e2e_build: {} - android_e2e_build: {} - build_multichain_e2e_ios_android_stage: + build_multichain_permissions_e2e_ios_android_stage: + abort_on_fail: true + workflows: + - build_ios_multichain_permissions_e2e: {} + - build_android_multichain_permissions_e2e: {} + run_multichain_permissions_e2e_ios_android_stage: + workflows: + - run_tag_multichain_permissions_ios: {} + - run_tag_multichain_permissions_android: {} + build_multichain_assets_e2e_ios_android_stage: abort_on_fail: true workflows: - - build_ios_multichain_e2e: {} - - build_android_multichain_e2e: {} - run_multichain_e2e_ios_android_stage: + - build_ios_multichain_assets_e2e: {} + - build_android_multichain_assets_e2e: {} + run_multichain_assets_e2e_ios_android_stage: workflows: - - run_tag_multichain_ios: {} - - run_tag_multichain_android: {} + - run_tag_multichain_assets_ios: {} + - run_tag_multichain_assets_android: {} run_smoke_e2e_ios_android_stage: workflows: - run_ios_api_specs: {} @@ -164,8 +177,10 @@ stages: # - run_tag_smoke_swaps_android: {} - run_tag_smoke_core_ios: {} - run_tag_smoke_core_android: {} - - run_tag_multichain_ios: {} - - run_tag_multichain_android: {} + - run_tag_multichain_permissions_ios: {} + - run_tag_multichain_permissions_android: {} + - run_tag_multichain_assets_ios: {} + - run_tag_multichain_assets_android: {} build_regression_e2e_ios_android_stage: workflows: - ios_build_regression_tests: {} @@ -539,11 +554,21 @@ workflows: - TEST_TYPE: 'upgrade' after_run: - wdio_android_e2e_test - build_ios_multichain_e2e: + build_ios_multichain_permissions_e2e: after_run: - ios_e2e_build # - android_e2e_build - build_android_multichain_e2e: + build_android_multichain_permissions_e2e: + meta: + bitrise.io: + stack: linux-docker-android-22.04 + machine_type_id: elite-xl + after_run: + - android_e2e_build + build_ios_multichain_assets_e2e: + after_run: + - ios_e2e_build + build_android_multichain_assets_e2e: meta: bitrise.io: stack: linux-docker-android-22.04 @@ -683,20 +708,36 @@ workflows: - TEST_SUITE_TAG: '.*SmokeCore.*' after_run: - android_e2e_test - run_tag_multichain_ios: + run_tag_multichain_permissions_ios: + envs: + - TEST_SUITE_FOLDER: './e2e/specs/multichain/*' + - TEST_SUITE_TAG: '.*SmokeMultiChainPermissions.*' + after_run: + - ios_e2e_test + run_tag_multichain_permissions_android: + meta: + bitrise.io: + stack: linux-docker-android-22.04 + machine_type_id: elite-xl + envs: + - TEST_SUITE_FOLDER: './e2e/specs/multichain/*' + - TEST_SUITE_TAG: '.*SmokeMultiChainPermissions.*' + after_run: + - android_e2e_test + run_tag_multichain_assets_ios: envs: - TEST_SUITE_FOLDER: './e2e/specs/multichain/*' - - TEST_SUITE_TAG: '.*SmokeMultiChain.*' + - TEST_SUITE_TAG: '.*SmokeMultiChainAssets.*' after_run: - ios_e2e_test - run_tag_multichain_android: + run_tag_multichain_assets_android: meta: bitrise.io: stack: linux-docker-android-22.04 machine_type_id: elite-xl envs: - TEST_SUITE_FOLDER: './e2e/specs/multichain/*' - - TEST_SUITE_TAG: '.*SmokeMultiChain.*' + - TEST_SUITE_TAG: '.*SmokeMultiChainAssets.*' after_run: - android_e2e_test android_e2e_build: @@ -1831,4 +1872,4 @@ trigger_map: - tag: 'v*.*.*-RC-*' pipeline: release_e2e_pipeline - push_branch: detox/address-regression-tests-slowdown - pipeline: multichain_e2e_pipeline + pipeline: multichain_permissions_e2e_pipeline diff --git a/e2e/specs/multichain/assets/asset-list.spec.js b/e2e/specs/multichain/assets/asset-list.spec.js index d33360a7f6f..056cb924ddc 100644 --- a/e2e/specs/multichain/assets/asset-list.spec.js +++ b/e2e/specs/multichain/assets/asset-list.spec.js @@ -1,6 +1,6 @@ // 'persists the preferred asset list preference when changing networks' -import { SmokeMultiChain } from '../../../tags'; +import { SmokeMultiChainAssets } from '../../../tags'; import WalletView from '../../../pages/wallet/WalletView'; import FixtureBuilder from '../../../fixtures/fixture-builder'; import { @@ -26,7 +26,7 @@ const ETHEREUM_NAME = 'Ethereum'; const AVAX_NAME = 'AVAX'; const BNB_NAME = 'BNB'; -describe(SmokeMultiChain('Import Tokens'), () => { +describe(SmokeMultiChainAssets('Import Tokens'), () => { beforeAll(async () => { await TestHelpers.reverseServerPort(); const fixture = new FixtureBuilder().withPopularNetworks().build(); diff --git a/e2e/specs/multichain/permissions/accounts/permission-system-revoke-multiple.spec.js b/e2e/specs/multichain/permissions/accounts/permission-system-revoke-multiple.spec.js index 5a77d78a195..039452344a3 100644 --- a/e2e/specs/multichain/permissions/accounts/permission-system-revoke-multiple.spec.js +++ b/e2e/specs/multichain/permissions/accounts/permission-system-revoke-multiple.spec.js @@ -11,11 +11,11 @@ import { loginToApp } from '../../../../viewHelper'; import FixtureBuilder from '../../../../fixtures/fixture-builder'; import { withFixtures } from '../../../../fixtures/fixture-helper'; import Assertions from '../../../../utils/Assertions'; -import { SmokeMultiChain } from '../../../../tags'; +import { SmokeMultiChainPermissions } from '../../../../tags'; const AccountTwoText = 'Account 2'; -describe(SmokeMultiChain('Account Permission Management'), () => { +describe(SmokeMultiChainPermissions('Account Permission Management'), () => { beforeAll(async () => { jest.setTimeout(150000); await TestHelpers.reverseServerPort(); diff --git a/e2e/specs/multichain/permissions/accounts/permission-system-revoke-single.spec.js b/e2e/specs/multichain/permissions/accounts/permission-system-revoke-single.spec.js index f2435342826..d1c5a2f8002 100644 --- a/e2e/specs/multichain/permissions/accounts/permission-system-revoke-single.spec.js +++ b/e2e/specs/multichain/permissions/accounts/permission-system-revoke-single.spec.js @@ -1,6 +1,6 @@ 'use strict'; import TestHelpers from '../../../../helpers'; -import { SmokeMultiChain } from '../../../../tags'; +import { SmokeMultiChainPermissions } from '../../../../tags'; import Browser from '../../../../pages/Browser/BrowserView'; import TabBarComponent from '../../../../pages/wallet/TabBarComponent'; import NetworkListModal from '../../../../pages/Network/NetworkListModal'; @@ -10,7 +10,7 @@ import { withFixtures } from '../../../../fixtures/fixture-helper'; import { loginToApp } from '../../../../viewHelper'; import Assertions from '../../../../utils/Assertions'; -describe(SmokeMultiChain('Account Permission Management'), () => { +describe(SmokeMultiChainPermissions('Account Permission Management'), () => { beforeAll(async () => { jest.setTimeout(150000); await TestHelpers.reverseServerPort(); diff --git a/e2e/specs/multichain/permissions/chains/permission-system-add-non-permitted.spec.js b/e2e/specs/multichain/permissions/chains/permission-system-add-non-permitted.spec.js index 1553600b2c6..36af037bba8 100644 --- a/e2e/specs/multichain/permissions/chains/permission-system-add-non-permitted.spec.js +++ b/e2e/specs/multichain/permissions/chains/permission-system-add-non-permitted.spec.js @@ -1,4 +1,4 @@ -import { SmokeMultiChain } from '../../../../tags'; +import { SmokeMultiChainPermissions } from '../../../../tags'; import { loginToApp } from '../../../../viewHelper'; import WalletView from '../../../../pages/wallet/WalletView'; import NetworkListModal from '../../../../pages/Network/NetworkListModal'; @@ -22,7 +22,7 @@ const fixtureServer = new FixtureServer(); const SEPOLIA = CustomNetworks.Sepolia.providerConfig.nickname; describe( - SmokeMultiChain('Chain Permission System, non-permitted chain, '), + SmokeMultiChainPermissions('Chain Permission System, non-permitted chain, '), () => { beforeAll(async () => { await TestHelpers.reverseServerPort(); diff --git a/e2e/specs/multichain/permissions/chains/permission-system-discard-changes.spec.js b/e2e/specs/multichain/permissions/chains/permission-system-discard-changes.spec.js index 5bcebcdc82a..fdbdcc39402 100644 --- a/e2e/specs/multichain/permissions/chains/permission-system-discard-changes.spec.js +++ b/e2e/specs/multichain/permissions/chains/permission-system-discard-changes.spec.js @@ -1,6 +1,6 @@ 'use strict'; import TestHelpers from '../../../../helpers'; -import { SmokeMultiChain } from '../../../../tags'; +import { SmokeMultiChainPermissions } from '../../../../tags'; import Browser from '../../../../pages/Browser/BrowserView'; import TabBarComponent from '../../../../pages/wallet/TabBarComponent'; import ConnectedAccountsModal from '../../../../pages/Browser/ConnectedAccountsModal'; @@ -11,7 +11,7 @@ import Assertions from '../../../../utils/Assertions'; import NetworkConnectMultiSelector from '../../../../pages/Browser/NetworkConnectMultiSelector'; import NetworkNonPemittedBottomSheet from '../../../../pages/Network/NetworkNonPemittedBottomSheet'; -describe(SmokeMultiChain('Chain Permission Management'), () => { +describe(SmokeMultiChainPermissions('Chain Permission Management'), () => { beforeAll(async () => { jest.setTimeout(150000); await TestHelpers.reverseServerPort(); diff --git a/e2e/specs/multichain/permissions/chains/permission-system-initial-connection.spec.js b/e2e/specs/multichain/permissions/chains/permission-system-initial-connection.spec.js index a6773893814..5e0659c1e57 100644 --- a/e2e/specs/multichain/permissions/chains/permission-system-initial-connection.spec.js +++ b/e2e/specs/multichain/permissions/chains/permission-system-initial-connection.spec.js @@ -1,6 +1,6 @@ 'use strict'; import TestHelpers from '../../../../helpers'; -import { SmokeMultiChain } from '../../../../tags'; +import { SmokeMultiChainPermissions } from '../../../../tags'; import Browser from '../../../../pages/Browser/BrowserView'; import TabBarComponent from '../../../../pages/wallet/TabBarComponent'; import TestDApp from '../../../../pages/Browser/TestDApp'; @@ -13,7 +13,7 @@ import ConnectBottomSheet from '../../../../pages/Browser/ConnectBottomSheet'; import NetworkNonPemittedBottomSheet from '../../../../pages/Network/NetworkNonPemittedBottomSheet'; import NetworkConnectMultiSelector from '../../../../pages/Browser/NetworkConnectMultiSelector'; -describe(SmokeMultiChain('Chain Permission Management'), () => { +describe(SmokeMultiChainPermissions('Chain Permission Management'), () => { beforeAll(async () => { jest.setTimeout(150000); await TestHelpers.reverseServerPort(); diff --git a/e2e/specs/multichain/permissions/chains/permission-system-remove.spec.js b/e2e/specs/multichain/permissions/chains/permission-system-remove.spec.js index e3e7ab3af4c..6c927a02e8f 100644 --- a/e2e/specs/multichain/permissions/chains/permission-system-remove.spec.js +++ b/e2e/specs/multichain/permissions/chains/permission-system-remove.spec.js @@ -1,6 +1,6 @@ 'use strict'; import TestHelpers from '../../../../helpers'; -import { SmokeMultiChain } from '../../../../tags'; +import { SmokeMultiChainPermissions } from '../../../../tags'; import Browser from '../../../../pages/Browser/BrowserView'; import TabBarComponent from '../../../../pages/wallet/TabBarComponent'; @@ -18,7 +18,7 @@ import NetworkEducationModal from '../../../../pages/Network/NetworkEducationMod import ConnectBottomSheet from '../../../../pages/Browser/ConnectBottomSheet'; import PermissionSummaryBottomSheet from '../../../../pages/Browser/PermissionSummaryBottomSheet'; -describe(SmokeMultiChain('Chain Permission Management'), () => { +describe(SmokeMultiChainPermissions('Chain Permission Management'), () => { beforeAll(async () => { jest.setTimeout(150000); await TestHelpers.reverseServerPort(); diff --git a/e2e/specs/multichain/permissions/chains/permission-system-revoke-single.spec.js b/e2e/specs/multichain/permissions/chains/permission-system-revoke-single.spec.js index 720c8db2cb7..5129d70bdaa 100644 --- a/e2e/specs/multichain/permissions/chains/permission-system-revoke-single.spec.js +++ b/e2e/specs/multichain/permissions/chains/permission-system-revoke-single.spec.js @@ -1,6 +1,6 @@ 'use strict'; import TestHelpers from '../../../../helpers'; -import { SmokeMultiChain } from '../../../../tags'; +import { SmokeMultiChainPermissions } from '../../../../tags'; import Browser from '../../../../pages/Browser/BrowserView'; import TabBarComponent from '../../../../pages/wallet/TabBarComponent'; import NetworkListModal from '../../../../pages/Network/NetworkListModal'; @@ -10,7 +10,7 @@ import { withFixtures } from '../../../../fixtures/fixture-helper'; import { loginToApp } from '../../../../viewHelper'; import Assertions from '../../../../utils/Assertions'; -describe(SmokeMultiChain('Chain Permission Management'), () => { +describe(SmokeMultiChainPermissions('Chain Permission Management'), () => { beforeAll(async () => { jest.setTimeout(150000); await TestHelpers.reverseServerPort(); diff --git a/e2e/specs/multichain/permissions/chains/permission-system-update-permissions.spec.js b/e2e/specs/multichain/permissions/chains/permission-system-update-permissions.spec.js index a4b50516810..dd6967759f1 100644 --- a/e2e/specs/multichain/permissions/chains/permission-system-update-permissions.spec.js +++ b/e2e/specs/multichain/permissions/chains/permission-system-update-permissions.spec.js @@ -1,6 +1,6 @@ 'use strict'; import TestHelpers from '../../../../helpers'; -import { SmokeMultiChain } from '../../../../tags'; +import { SmokeMultiChainPermissions } from '../../../../tags'; import Browser from '../../../../pages/Browser/BrowserView'; import TabBarComponent from '../../../../pages/wallet/TabBarComponent'; import ConnectedAccountsModal from '../../../../pages/Browser/ConnectedAccountsModal'; @@ -15,7 +15,7 @@ import WalletView from '../../../../pages/wallet/WalletView'; import NetworkEducationModal from '../../../../pages/Network/NetworkEducationModal'; import PermissionSummaryBottomSheet from '../../../../pages/Browser/PermissionSummaryBottomSheet'; -describe(SmokeMultiChain('Chain Permission Management'), () => { +describe(SmokeMultiChainPermissions('Chain Permission Management'), () => { beforeAll(async () => { jest.setTimeout(150000); await TestHelpers.reverseServerPort(); diff --git a/e2e/tags.js b/e2e/tags.js index 2c7e0950126..2012dee279a 100644 --- a/e2e/tags.js +++ b/e2e/tags.js @@ -7,7 +7,8 @@ const tags = { SmokeRest: 'SmokeRest:', smokeAssets: 'smokeAssets:', smokeIdentity: 'smokeIdentity:', - smokeMultiChain: 'SmokeMultiChain:', + smokeMultiChainPermissions: 'SmokeMultiChainPermissions:', + smokeMultiChainAssets: 'SmokeMultiChainAssets:', }; const Regression = (testName) => `${tags.regression} ${testName}`; @@ -18,8 +19,11 @@ const SmokeConfirmations = (testName) => const SmokeSwaps = (testName) => `${tags.SmokeSwaps} ${testName}`; const SmokeAssets = (testName) => `${tags.smokeAssets} ${testName}`; const SmokeIdentity = (testName) => `${tags.smokeIdentity} ${testName}`; +const SmokeMultiChainPermissions = (testName) => + `${tags.smokeMultiChainPermissions} ${testName}`; +const SmokeMultiChainAssets = (testName) => + `${tags.smokeMultiChainAssets} ${testName}`; -const SmokeMultiChain = (testName) => `${tags.smokeMultiChain} ${testName}`; export { Regression, SmokeAccounts, @@ -28,5 +32,6 @@ export { SmokeSwaps, SmokeAssets, SmokeIdentity, - SmokeMultiChain, + SmokeMultiChainPermissions, + SmokeMultiChainAssets, };