Commit 364ea97b authored by dpapad's avatar dpapad Committed by Commit Bot

Settings WebUI: Enable a few more tests with Polymer 2.

Enabling the following tests:
 CrSettingsChromeCleanupPageTest.All (Removed usage of /deep/)
 CrSettingsMultidevicePageContainerTest.All (already passing)

Also fixing some overlapping inclusion and exclusion patterns (they
should not exist).

Bug: 875452,860069
Change-Id: Iba0546d24f032af0bfa4c3fb15b383e2ef938269
Reviewed-on: https://chromium-review.googlesource.com/1227479Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592466}
parent 5e1ab061
......@@ -103,7 +103,7 @@ const defaultScannerResults = {
*/
function validateVisibleItemsList(originalItems, visibleItems) {
let visibleItemsList =
visibleItems.querySelectorAll('* /deep/ .visible-item');
visibleItems.shadowRoot.querySelectorAll('.visible-item');
const moreItemsLink = visibleItems.$$('#more-items-link');
if (originalItems.length <= settings.CHROME_CLEANUP_DEFAULT_ITEMS_TO_SHOW) {
......@@ -119,7 +119,8 @@ function validateVisibleItemsList(originalItems, visibleItems) {
moreItemsLink.click();
Polymer.dom.flush();
visibleItemsList = visibleItems.querySelectorAll('* /deep/ .visible-item');
visibleItemsList =
visibleItems.shadowRoot.querySelectorAll('.visible-item');
assertEquals(visibleItemsList.length, originalItems.length);
assertTrue(moreItemsLink.hidden);
}
......
......@@ -423,8 +423,10 @@ cr.define('settings_people_page_quick_unlock', function() {
// Create setup-pin element.
testElement = document.createElement('settings-setup-pin-dialog');
testElement.quickUnlockPrivate = quickUnlockPrivateApi;
document.body.appendChild(testElement);
let testPinKeyboard = testElement.$.pinKeyboard;
testPinKeyboard.quickUnlockPrivate = quickUnlockPrivateApi;
testPinKeyboard.setModes = (modes, credentials, onComplete) => {
quickUnlockPrivateApi.setModes(
quickUnlockPrivateApi.getFakeToken(), modes, credentials, () => {
......@@ -433,7 +435,6 @@ cr.define('settings_people_page_quick_unlock', function() {
};
testPinKeyboard.writeUma = fakeUma.recordProgress.bind(fakeUma);
document.body.appendChild(testElement);
Polymer.dom.flush();
titleDiv = getFromElement('div[slot=title]');
......
......@@ -31,7 +31,6 @@
-CrSettingsPrivacyPageTest.All
# Tests that fail only on official builds.
-CrSettingsChromeCleanupPageTest.All
-CrSettingsIncompatibleApplicationsPageTest.All
# Most of the a11y tests are failing because they use /deep/. Should be
......@@ -71,7 +70,6 @@
-CrSettingsLanguagesPageTest.AddLanguagesDialog
-CrSettingsLanguagesPageTest.LanguageMenu
-CrSettingsLanguagesPageTest.Spellcheck
-CrSettingsMultidevicePageContainerTest.All
-CrSettingsMultidevicePageTest.All
-CrSettingsPeoplePageLockScreenTest.All
-CrSettingsPeoplePageQuickUnlockAuthenticateTest.All
......@@ -169,6 +167,7 @@ CrSettingsCategorySettingExceptionsTest.*
CrSettingsCertificateManagerTest.*
CrSettingsChangePasswordPageTest.*
CrSettingsCheckboxTest.*
CrSettingsChromeCleanupPageTest.*
CrSettingsDateTimePageTest.*
CrSettingsDefaultBrowserTest.*
CrSettingsDevicePageTest.DevicePageTest
......@@ -191,6 +190,7 @@ CrSettingsMainPageTest.*
CrSettingsMetricsReportingTest.*
CrSettingsMultideviceFeatureItemTest.*
CrSettingsMultideviceFeatureToggleTest.*
CrSettingsMultidevicePageContainerTest.*
CrSettingsMultidevicePageTest.*
CrSettingsNonExistentRouteTest.*
CrSettingsOnStartupPageTest.*
......@@ -198,12 +198,10 @@ CrSettingsPaymentsSectionTest.*
CrSettingsPeoplePageChangePictureTest.*
CrSettingsPeoplePageManageProfileTest.*
CrSettingsPeoplePageSetupPinDialogTest.*
CrSettingsPeoplePageSyncAccountControlTest.*
CrSettingsPersonalizationOptionsTest.*
CrSettingsPrefsTest.*
CrSettingsPrefUtilTest.*
CrSettingsPrintingPageTest.*
CrSettingsPrivacyPageTest.*
CrSettingsProtocolHandlersTest.*
CrSettingsResetPageTest.*
CrSettingsResetProfileBannerTest.*
......
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