Skip to content

Commit

Permalink
fix: launching activity defined with fully qualified name (#2269) (#2283
Browse files Browse the repository at this point in the history
)

Co-authored-by: Michał Pierzchała <thymikee@gmail.com>
  • Loading branch information
tido64 and thymikee committed Jan 31, 2024
1 parent 6a83eb3 commit da7b6ac
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,28 @@ test('launches adb shell with intent to launch com.myapp.MainActivity with diffe
);
});

test('launches adb shell with intent to launch com.myapp.MainActivity with different appId than packageName on a simulator when mainActivity is fully qualified name', () => {
tryLaunchAppOnDevice(
device,
{...androidProject, mainActivity: 'com.myapp.MainActivity'},
adbPath,
args,
);

expect(execa.sync).toHaveBeenCalledWith(
'path/to/adb',
[
'-s',
'emulator-5554',
...shellStartCommand,
'-n',
'com.myapp.custom/com.myapp.MainActivity',
...actionCategoryFlags,
],
{stdio: 'inherit'},
);
});

test('launches adb shell with intent to launch com.myapp.MainActivity with same appId as packageName on a simulator', () => {
tryLaunchAppOnDevice(
device,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ function tryLaunchAppOnDevice(
.filter(Boolean)
.join('.');

const activityToLaunch = mainActivity.includes('.')
const activityToLaunch = mainActivity.startsWith(packageName)
? mainActivity
: mainActivity.startsWith('.')
? [packageName, mainActivity].join('')
: [packageName, mainActivity].filter(Boolean).join('.');

Expand Down

0 comments on commit da7b6ac

Please sign in to comment.