Skip to content

Commit 4ee2025

Browse files
committed
test: make lifecycle provider ownership explicit
1 parent 43f3c85 commit 4ee2025

2 files changed

Lines changed: 11 additions & 17 deletions

File tree

‎src/daemon/handlers/__tests__/session-open-target.test.ts‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
import { beforeEach, expect, test, vi } from 'vitest';
22
import type { DeviceInfo } from '@agent-device/kernel/device';
3-
import { isActiveProviderDevice } from '../../../provider-device-runtime.ts';
43
import { IOS_SIMULATOR } from '../../../__tests__/test-utils/device-fixtures.ts';
54
import { getAndroidAppState } from '../../../platforms/android/app-lifecycle.ts';
65
import {
76
inferAndroidPackageAfterOpen,
87
resolveSessionAppBundleIdForTarget,
98
} from '../../../platform-runtime-open-target.ts';
109

11-
vi.mock('../../../provider-device-runtime.ts', () => ({
12-
isActiveProviderDevice: vi.fn(() => false),
13-
}));
1410
vi.mock('../../../platforms/android/app-lifecycle.ts', () => ({
1511
getAndroidAppState: vi.fn(),
1612
}));
1713

18-
const mockIsActiveProviderDevice = vi.mocked(isActiveProviderDevice);
1914
const mockGetAndroidAppState = vi.mocked(getAndroidAppState);
2015
const androidDevice: DeviceInfo = {
2116
platform: 'android',
@@ -34,7 +29,6 @@ const harmonyDevice: DeviceInfo = {
3429

3530
beforeEach(() => {
3631
vi.clearAllMocks();
37-
mockIsActiveProviderDevice.mockReturnValue(false);
3832
});
3933

4034
test('inferAndroidPackageAfterOpen reads foreground package for Android URL opens', async () => {
@@ -83,14 +77,14 @@ test.each(['myapp://login', 'https://example.com', 'Demo App'])(
8377
// id at all (#1658); preferring the stored value left `open com.a` then
8478
// `open com.b` reporting com.a for every appBundleId-gated command after it.
8579
test('provider iOS adopts a new bundle-id target over the tracked app', async () => {
86-
mockIsActiveProviderDevice.mockReturnValue(true);
8780
const resolveAndroidPackageForOpen = vi.fn(async () => 'com.example.android');
8881

8982
const bundleId = await resolveSessionAppBundleIdForTarget(
9083
IOS_SIMULATOR,
9184
'com.example.demo',
9285
'com.example.installed',
9386
resolveAndroidPackageForOpen,
87+
true,
9488
);
9589

9690
expect(bundleId).toBe('com.example.demo');
@@ -103,14 +97,13 @@ test.each([
10397
['an app display name', 'Demo App'],
10498
['no target', undefined],
10599
])('provider iOS keeps the tracked app across %s', async (_label, openTarget) => {
106-
mockIsActiveProviderDevice.mockReturnValue(true);
107-
108100
await expect(
109101
resolveSessionAppBundleIdForTarget(
110102
IOS_SIMULATOR,
111103
openTarget,
112104
'com.example.installed',
113105
vi.fn(async () => 'com.example.android'),
106+
true,
114107
),
115108
).resolves.toBe('com.example.installed');
116109
});
@@ -119,22 +112,21 @@ test.each([
119112
// tooling can look one up. Dropping the target left the session with no app
120113
// identity at all, so every appBundleId-gated command refused a live session.
121114
test('provider iOS adopts a bundle-id open target when none is known', async () => {
122-
mockIsActiveProviderDevice.mockReturnValue(true);
123115
const resolveAndroidPackageForOpen = vi.fn(async () => 'com.example.android');
124116

125117
const bundleId = await resolveSessionAppBundleIdForTarget(
126118
IOS_SIMULATOR,
127119
'com.example.demo',
128120
undefined,
129121
resolveAndroidPackageForOpen,
122+
true,
130123
);
131124

132125
expect(bundleId).toBe('com.example.demo');
133126
expect(resolveAndroidPackageForOpen).not.toHaveBeenCalled();
134127
});
135128

136129
test('provider Android adopts an explicit package without local target resolution', async () => {
137-
mockIsActiveProviderDevice.mockReturnValue(true);
138130
const resolveAndroidPackageForOpen = vi.fn(async () => 'com.local.fallback');
139131

140132
await expect(
@@ -143,18 +135,18 @@ test('provider Android adopts an explicit package without local target resolutio
143135
'com.example.cloud',
144136
'com.example.previous',
145137
resolveAndroidPackageForOpen,
138+
true,
146139
),
147140
).resolves.toBe('com.example.cloud');
148141

149142
expect(resolveAndroidPackageForOpen).not.toHaveBeenCalled();
150143
});
151144

152145
test('provider Android never probes local foreground state after a deep-link open', async () => {
153-
mockIsActiveProviderDevice.mockReturnValue(true);
154146
mockGetAndroidAppState.mockRejectedValue(new Error('host adb must stay unused'));
155147

156148
await expect(
157-
inferAndroidPackageAfterOpen(androidDevice, 'exp://10.0.2.2:8081', undefined),
149+
inferAndroidPackageAfterOpen(androidDevice, 'exp://10.0.2.2:8081', undefined, true),
158150
).resolves.toBeUndefined();
159151

160152
expect(mockGetAndroidAppState).not.toHaveBeenCalled();
@@ -166,14 +158,13 @@ test.each([
166158
['a web URL', 'https://example.com'],
167159
['no target', undefined],
168160
])('provider iOS adopts nothing from %s', async (_label, openTarget) => {
169-
mockIsActiveProviderDevice.mockReturnValue(true);
170-
171161
await expect(
172162
resolveSessionAppBundleIdForTarget(
173163
IOS_SIMULATOR,
174164
openTarget,
175165
undefined,
176166
vi.fn(async () => undefined),
167+
true,
177168
),
178169
).resolves.toBeUndefined();
179170
});

‎src/daemon/handlers/__tests__/session-relaunch-close.test.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ test('open --relaunch leaves the old frame expired when the close dispatch fails
103103
expect(sessionStore.get(sessionName)?.refFrameState).toBe('expired');
104104
});
105105

106-
test('open --relaunch skips provider pre-close before first provider session exists', async () => {
106+
test('open --relaunch does not let an ambient provider claim suppress a local pre-close', async () => {
107107
const sessionStore = makeSessionStore();
108108
const sessionName = 'provider-android-session';
109109
const device = {
@@ -148,7 +148,10 @@ test('open --relaunch skips provider pre-close before first provider session exi
148148

149149
expect(response).toBeTruthy();
150150
expect(response?.ok).toBe(true);
151-
expect(calls).toEqual([{ command: 'open', positionals: ['com.example.app'] }]);
151+
expect(calls).toEqual([
152+
{ command: 'close', positionals: ['com.example.app'] },
153+
{ command: 'open', positionals: ['com.example.app'] },
154+
]);
152155
} finally {
153156
setActiveProviderDeviceRuntimes([]);
154157
}

0 commit comments

Comments
 (0)