Skip to content

fix(ios): skip simulator fallback for physical device UDIDs #2829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
huytdps13400 wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −5
Open

fix(ios): skip simulator fallback for physical device UDIDs #2829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 26 additions & 1 deletion packages/cli-platform-apple/src/commands/runCommand/__tests__/createRun.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function buildArgs(overrides: Record<string, unknown> = {}) {
} as any;
}

describe('createRun no-flag default targeting (issue #2765)', () => {
describe('createRun device targeting', () => {
let chdirSpy: jest.SpyInstance;

beforeEach(() => {
Expand Down Expand Up @@ -153,6 +153,31 @@ describe('createRun no-flag default targeting (issue #2765)', () => {
expect(runOnSimulator).not.toHaveBeenCalled();
});

test('connected iPhone + --udid -> does not resolve a fallback simulator', async () => {
(listDevices as jest.Mock).mockResolvedValue([physicalDevice]);
(getFallbackSimulator as jest.Mock).mockImplementation(() => {
throw new Error('No simulator available');
});

await createRun({platformName: 'ios'})(
[],
buildCtx(),
buildArgs({udid: physicalDevice.udid}),
);

expect(getFallbackSimulator).not.toHaveBeenCalled();
expect(runOnDevice).toHaveBeenCalledTimes(1);
expect(runOnDevice).toHaveBeenCalledWith(
physicalDevice,
'ios',
'Debug',
'Demo',
expect.anything(),
expect.anything(),
);
expect(runOnSimulator).not.toHaveBeenCalled();
});

test('no devices, no flags -> launches fallback simulator', async () => {
(listDevices as jest.Mock).mockResolvedValue([fallbackSimulator]);

Expand Down
8 changes: 4 additions & 4 deletions packages/cli-platform-apple/src/commands/runCommand/createRun.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ const createRun =
}
}

const fallbackSimulator =
const getFallbackDevice = () =>
platformName === 'ios' || platformName === 'tvos'
? getFallbackSimulator(args)
: devices[0];
Expand Down Expand Up @@ -268,7 +268,7 @@ const createRun =
);
const connectedDevices = devices.filter(({type}) => type === 'device');

const targetSimulator = bootedSimulators[0] ?? fallbackSimulator;
const targetSimulator = bootedSimulators[0] ?? getFallbackDevice();

if (bootedSimulators.length === 0) {
logger.info(
Expand Down Expand Up @@ -414,7 +414,7 @@ const createRun =
mode,
scheme,
args,
matchedSimulator ?? fallbackSimulator,
matchedSimulator ?? getFallbackDevice(),
);
} else {
runOnSimulator(
Expand All @@ -423,7 +423,7 @@ const createRun =
mode,
scheme,
args,
fallbackSimulator,
getFallbackDevice(),
);
}
};
Expand Down
Loading