Skip to content

Commit

Permalink
Merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
burtonemily committed Nov 15, 2024
1 parent 85b9c3e commit cc94258
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
1 change: 1 addition & 0 deletions run/test/specs/user_actions_hide_recovery_password.spec.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { englishStripped } from '../../localizer/i18n/localizedString';
import { bothPlatformsIt } from '../../types/sessionIt';
import { USERNAME } from '../../types/testing';
import { ContinueButton } from './locators/global';
Expand Down
4 changes: 2 additions & 2 deletions run/types/sessionIt.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { test } from '@playwright/test';
import { SupportedPlatformsType } from '../test/specs/utils/open_app';
import { testRisk } from './testing';
import { TestRisk } from './testing';

export function androidIt(
title: string,
Expand Down Expand Up @@ -66,7 +66,7 @@ function mobileIt(

export function bothPlatformsIt(
title: string,
testRisk: testRisk,
testRisk: TestRisk,
testToRun: (platform: SupportedPlatformsType) => Promise<void>,
shouldSkip = false
) {
Expand Down
6 changes: 1 addition & 5 deletions run/types/testing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,4 @@ export type Id =
| 'com.android.chrome:id/signin_fre_dismiss_button'
| 'com.android.chrome:id/negative_button';

export type TestRisk =
| 'high'
| 'medium'
| 'low'
| 'undefined';
export type TestRisk = 'high' | 'medium' | 'low' | undefined;

0 comments on commit cc94258

Please sign in to comment.