Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ export async function runOnboardingImportWalletBenchmark(): Promise<BenchmarkRun
const isFirefox = process.env.SELENIUM_BROWSER === Browser.FIREFOX;
if (isFirefox) {
await onboardingMetricsFlow(driver, {
participateInMetaMetrics: false,
completedMetaMetricsOnboarding: true,
optedIn: false,
dataCollectionForMarketing: false,
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ export async function runOnboardingNewWalletBenchmark(): Promise<BenchmarkRunRes
const isFirefox = process.env.SELENIUM_BROWSER === Browser.FIREFOX;
if (isFirefox) {
await onboardingMetricsFlow(driver, {
participateInMetaMetrics: false,
completedMetaMetricsOnboarding: true,
optedIn: false,
dataCollectionForMarketing: false,
});
}
Expand Down
9 changes: 5 additions & 4 deletions test/e2e/tests/metrics/app-installed.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { getEventPayloads, withFixtures } from '../../helpers';
import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
import OnboardingMetricsPage from '../../page-objects/pages/onboarding/onboarding-metrics-page';
import StartOnboardingPage from '../../page-objects/pages/onboarding/start-onboarding-page';
import { MOCK_META_METRICS_ID, WALLET_PASSWORD } from '../../constants';
import { MOCK_ANALYTICS_ID, WALLET_PASSWORD } from '../../constants';
import OnboardingPasswordPage from '../../page-objects/pages/onboarding/onboarding-password-page';
import SecureWalletPage from '../../page-objects/pages/onboarding/secure-wallet-page';
import { skipPasskeySetup } from '../../page-objects/flows/onboarding.flow';
Expand Down Expand Up @@ -49,8 +49,9 @@ describe('App Installed Events', function () {
{
fixtures: new FixtureBuilderV2({ onboarding: true })
.withMetaMetricsController({
metaMetricsId: MOCK_META_METRICS_ID,
participateInMetaMetrics: true,
analyticsId: MOCK_ANALYTICS_ID,
completedMetaMetricsOnboarding: true,
optedIn: true,
})
.build(),
title: this.test?.fullTitle(),
Expand Down Expand Up @@ -105,7 +106,7 @@ describe('App Installed Events', function () {
{
fixtures: new FixtureBuilderV2({ onboarding: true })
.withMetaMetricsController({
metaMetricsId: MOCK_META_METRICS_ID,
analyticsId: MOCK_ANALYTICS_ID,
})
.build(),
title: this.test?.fullTitle(),
Expand Down
17 changes: 10 additions & 7 deletions test/e2e/tests/metrics/app-opened.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { strict as assert } from 'assert';
import { Mockttp } from 'mockttp';
import { getEventPayloads, withFixtures } from '../../helpers';
import { MOCK_META_METRICS_ID } from '../../constants';
import { MOCK_ANALYTICS_ID } from '../../constants';
import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
import TestDapp from '../../page-objects/pages/test-dapp';
import { login } from '../../page-objects/flows/login.flow';
Expand Down Expand Up @@ -34,8 +34,9 @@ describe('App Opened metric', function () {
{
fixtures: new FixtureBuilderV2()
.withMetaMetricsController({
metaMetricsId: MOCK_META_METRICS_ID,
participateInMetaMetrics: true,
analyticsId: MOCK_ANALYTICS_ID,
completedMetaMetricsOnboarding: true,
optedIn: true,
})
.build(),
title: this.test?.fullTitle(),
Expand All @@ -56,8 +57,9 @@ describe('App Opened metric', function () {
{
fixtures: new FixtureBuilderV2()
.withMetaMetricsController({
metaMetricsId: MOCK_META_METRICS_ID,
participateInMetaMetrics: false,
analyticsId: MOCK_ANALYTICS_ID,
completedMetaMetricsOnboarding: true,
optedIn: false,
})
.build(),
title: this.test?.fullTitle(),
Expand All @@ -79,8 +81,9 @@ describe('App Opened metric', function () {
fixtures: new FixtureBuilderV2()
.withPermissionControllerConnectedToTestDapp()
.withMetaMetricsController({
metaMetricsId: MOCK_META_METRICS_ID,
participateInMetaMetrics: true,
analyticsId: MOCK_ANALYTICS_ID,
completedMetaMetricsOnboarding: true,
optedIn: true,
})
.build(),
title: this.test?.fullTitle(),
Expand Down
30 changes: 18 additions & 12 deletions test/e2e/tests/metrics/dapp-viewed.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,9 @@ describe('Dapp viewed Event', function () {
dappOptions: { numberOfTestDapps: 1 },
fixtures: new FixtureBuilderV2()
.withMetaMetricsController({
metaMetricsId: null,
participateInMetaMetrics: true,
analyticsId: null,
completedMetaMetricsOnboarding: true,
optedIn: true,
})
.build(),
title: this.test?.fullTitle(),
Expand Down Expand Up @@ -121,8 +122,9 @@ describe('Dapp viewed Event', function () {
dappOptions: { numberOfTestDapps: 1 },
fixtures: new FixtureBuilderV2()
.withMetaMetricsController({
metaMetricsId: validFakeMetricsId, // 1% sample rate for dapp viewed event
participateInMetaMetrics: true,
analyticsId: validFakeMetricsId, // 1% sample rate for dapp viewed event
completedMetaMetricsOnboarding: true,
optedIn: true,
})
.build(),
title: this.test?.fullTitle(),
Expand Down Expand Up @@ -163,8 +165,9 @@ describe('Dapp viewed Event', function () {
dappOptions: { numberOfTestDapps: 1 },
fixtures: new FixtureBuilderV2()
.withMetaMetricsController({
metaMetricsId: validFakeMetricsId,
participateInMetaMetrics: true,
analyticsId: validFakeMetricsId,
completedMetaMetricsOnboarding: true,
optedIn: true,
})
.build(),
title: this.test?.fullTitle(),
Expand Down Expand Up @@ -208,8 +211,9 @@ describe('Dapp viewed Event', function () {
dappOptions: { numberOfTestDapps: 1 },
fixtures: new FixtureBuilderV2()
.withMetaMetricsController({
metaMetricsId: validFakeMetricsId,
participateInMetaMetrics: true,
analyticsId: validFakeMetricsId,
completedMetaMetricsOnboarding: true,
optedIn: true,
})
.build(),
title: this.test?.fullTitle(),
Expand Down Expand Up @@ -256,8 +260,9 @@ describe('Dapp viewed Event', function () {
dappOptions: { numberOfTestDapps: 1 },
fixtures: new FixtureBuilderV2()
.withMetaMetricsController({
metaMetricsId: validFakeMetricsId,
participateInMetaMetrics: true,
analyticsId: validFakeMetricsId,
completedMetaMetricsOnboarding: true,
optedIn: true,
})
.build(),
title: this.test?.fullTitle(),
Expand Down Expand Up @@ -301,8 +306,9 @@ describe('Dapp viewed Event', function () {
dappOptions: { numberOfTestDapps: 1 },
fixtures: new FixtureBuilderV2()
.withMetaMetricsController({
metaMetricsId: validFakeMetricsId,
participateInMetaMetrics: true,
analyticsId: validFakeMetricsId,
completedMetaMetricsOnboarding: true,
optedIn: true,
})
.build(),
title: this.test?.fullTitle(),
Expand Down
14 changes: 8 additions & 6 deletions test/e2e/tests/metrics/delete-metametrics-data.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { strict as assert } from 'assert';
import { Suite } from 'mocha';
import { MockedEndpoint, Mockttp } from 'mockttp';
import { MOCK_META_METRICS_ID } from '../../constants';
import { MOCK_ANALYTICS_ID } from '../../constants';
import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
import { getEventPayloads, withFixtures } from '../../helpers';
import { login } from '../../page-objects/flows/login.flow';
Expand Down Expand Up @@ -44,7 +44,7 @@ const mockSegment = async (mockServer: Mockttp) => {
JSON.stringify({
regulationType: 'DELETE_ONLY',
subjectType: 'USER_ID',
subjectIds: [MOCK_META_METRICS_ID],
subjectIds: [MOCK_ANALYTICS_ID],
}),
)
.thenCallback(() => ({
Expand Down Expand Up @@ -80,8 +80,9 @@ describe('Delete MetaMetrics Data', function (this: Suite) {
{
fixtures: new FixtureBuilderV2()
.withMetaMetricsController({
metaMetricsId: MOCK_META_METRICS_ID,
participateInMetaMetrics: true,
analyticsId: MOCK_ANALYTICS_ID,
completedMetaMetricsOnboarding: true,
optedIn: true,
})
.build(),
title: this.test?.fullTitle(),
Expand Down Expand Up @@ -142,8 +143,9 @@ describe('Delete MetaMetrics Data', function (this: Suite) {
{
fixtures: new FixtureBuilderV2()
.withMetaMetricsController({
metaMetricsId: MOCK_META_METRICS_ID,
participateInMetaMetrics: false,
analyticsId: MOCK_ANALYTICS_ID,
completedMetaMetricsOnboarding: true,
optedIn: false,
})
.build(),
title: this.test?.fullTitle(),
Expand Down
12 changes: 7 additions & 5 deletions test/e2e/tests/metrics/developer-options-sentry.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Driver } from '../../webdriver/driver';
import { login } from '../../page-objects/flows/login.flow';
import { triggerCrash } from '../../page-objects/flows/crash.flow';
import ErrorPage from '../../page-objects/pages/error-page';
import { MOCK_META_METRICS_ID } from '../../constants';
import { MOCK_ANALYTICS_ID } from '../../constants';

async function mockSentryError(mockServer: MockttpServer) {
return [
Expand All @@ -28,8 +28,9 @@ describe('Developer Options - Sentry', function (this: Suite) {
{
fixtures: new FixtureBuilderV2()
.withMetaMetricsController({
metaMetricsId: MOCK_META_METRICS_ID,
participateInMetaMetrics: true,
analyticsId: MOCK_ANALYTICS_ID,
completedMetaMetricsOnboarding: true,
optedIn: true,
})
.build(),
title: this.test?.fullTitle(),
Expand All @@ -55,8 +56,9 @@ describe('Developer Options - Sentry', function (this: Suite) {
{
fixtures: new FixtureBuilderV2()
.withMetaMetricsController({
metaMetricsId: MOCK_META_METRICS_ID,
participateInMetaMetrics: true,
analyticsId: MOCK_ANALYTICS_ID,
completedMetaMetricsOnboarding: true,
optedIn: true,
})
.build(),
title: this.test?.fullTitle(),
Expand Down
12 changes: 7 additions & 5 deletions test/e2e/tests/metrics/error-page.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { strict as assert } from 'assert';
import { Mockttp } from 'mockttp';
import { getEventPayloads, withFixtures } from '../../helpers';
import { MOCK_META_METRICS_ID } from '../../constants';
import { MOCK_ANALYTICS_ID } from '../../constants';
import FixtureBuilderV2 from '../../fixtures/fixture-builder-v2';
import ErrorPage from '../../page-objects/pages/error-page';
import { triggerCrash } from '../../page-objects/flows/crash.flow';
Expand Down Expand Up @@ -34,8 +34,9 @@ describe('Error Page', function () {
{
fixtures: new FixtureBuilderV2()
.withMetaMetricsController({
metaMetricsId: MOCK_META_METRICS_ID,
participateInMetaMetrics: true,
analyticsId: MOCK_ANALYTICS_ID,
completedMetaMetricsOnboarding: true,
optedIn: true,
})
.build(),
title: this.test?.fullTitle(),
Expand Down Expand Up @@ -74,8 +75,9 @@ describe('Error Page', function () {
{
fixtures: new FixtureBuilderV2()
.withMetaMetricsController({
metaMetricsId: MOCK_META_METRICS_ID,
participateInMetaMetrics: true,
analyticsId: MOCK_ANALYTICS_ID,
completedMetaMetricsOnboarding: true,
optedIn: true,
})
.build(),
title: this.test?.fullTitle(),
Expand Down
Loading
Loading