Commit 21ab427d authored by Regan Hsu's avatar Regan Hsu Committed by Commit Bot

[CrOS Settings] Fix flaky OSSettingsMultideviceFeatureItemV3Test.

Fixed by directly clicking on the element that has the corresponding
click handler instead of its child elements.

Fixed: 1146224
Change-Id: Ia7b98e89f9de280cd0e0d1bc73e8ad507fb97c32
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2534697Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Regan Hsu <hsuregan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827090}
parent 51b657dd
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
} }
</style> </style>
<div id="card" class="settings-box two-line no-padding"> <div id="card" class="settings-box two-line no-padding">
<div class="link-wrapper" actionable <div id="linkWrapper" class="link-wrapper"
actionable$="[[isRowClickable_( actionable$="[[isRowClickable_(
feature, pageContentData, subpageRoute)]]" feature, pageContentData, subpageRoute)]]"
on-click="handleItemClick_"> on-click="handleItemClick_">
......
...@@ -75,10 +75,10 @@ suite('Multidevice', function() { ...@@ -75,10 +75,10 @@ suite('Multidevice', function() {
* @param {HTMLElement} element. Target of click. * @param {HTMLElement} element. Target of click.
*/ */
async function checkWhetherFeatureToggleClickedFired(element) { async function checkWhetherFeatureToggleClickedFired(element) {
const showCellularSetupPromise = const expectedEvent =
test_util.eventToPromise('feature-toggle-clicked', featureToggle); test_util.eventToPromise('feature-toggle-clicked', featureToggle);
element.click(); element.click();
await Promise.all([showCellularSetupPromise, test_util.flushTasks()]); await Promise.all([expectedEvent, test_util.flushTasks()]);
} }
setup(function() { setup(function() {
...@@ -128,11 +128,7 @@ suite('Multidevice', function() { ...@@ -128,11 +128,7 @@ suite('Multidevice', function() {
featureState = settings.MultiDeviceFeatureState.ENABLED_BY_USER; featureState = settings.MultiDeviceFeatureState.ENABLED_BY_USER;
featureItem.subpageRoute = null; featureItem.subpageRoute = null;
await checkWhetherFeatureToggleClickedFired( await checkWhetherFeatureToggleClickedFired(featureItem.$$('#linkWrapper'));
featureItem.$$('#item-text-container'));
await checkWhetherFeatureToggleClickedFired(featureItem.$$('iron-icon'));
await checkWhetherFeatureToggleClickedFired(
featureItem.$$('#featureSecondary'));
}); });
test('toggle click does not navigate to subpage in any state', function() { test('toggle click does not navigate to subpage in any state', function() {
......
...@@ -87,8 +87,7 @@ TEST_F('OSSettingsNearbyShareSubPageV3Test', 'All', () => mocha.run()); ...@@ -87,8 +87,7 @@ TEST_F('OSSettingsNearbyShareSubPageV3Test', 'All', () => mocha.run());
['InternetSubpage', 'internet_subpage_tests.m.js'], ['InternetSubpage', 'internet_subpage_tests.m.js'],
['InternetPage', 'internet_page_tests.m.js'], ['InternetPage', 'internet_page_tests.m.js'],
['LocalizedLink', 'localized_link_test.m.js'], ['LocalizedLink', 'localized_link_test.m.js'],
// TODO(https://crbug.com/1146224): Re-enable flaky test. ['MultideviceFeatureItem', 'multidevice_feature_item_tests.m.js'],
// ['MultideviceFeatureItem', 'multidevice_feature_item_tests.m.js'],
['MultideviceFeatureToggle', 'multidevice_feature_toggle_tests.m.js'], ['MultideviceFeatureToggle', 'multidevice_feature_toggle_tests.m.js'],
['MultidevicePage', 'multidevice_page_tests.m.js'], ['MultidevicePage', 'multidevice_page_tests.m.js'],
['MultideviceSmartLockSubPage', 'multidevice_smartlock_subpage_test.m.js'], ['MultideviceSmartLockSubPage', 'multidevice_smartlock_subpage_test.m.js'],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment