Commit 54f66a49 authored by rbpotter's avatar rbpotter Committed by Commit Bot

Settings UI: Fix and re-enable some tests with Polymer 2

Re-enabling:
CrSettingsCrostiniPageTest.All
since it now seems to be passing on ToT.

Fixing and re-enabling:
CrSettingsBluetoothPageTest.All

Bug: 875454
Change-Id: I0a4211439267d5e9efc9a4cb6a04e6964ba0e7fd
Reviewed-on: https://chromium-review.googlesource.com/c/1265824Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#597375}
parent fdc7c7a5
...@@ -47,8 +47,9 @@ cr.define('settings', function() { ...@@ -47,8 +47,9 @@ cr.define('settings', function() {
/** @override */ /** @override */
connect: function(address, opt_callback) { connect: function(address, opt_callback) {
const device = let device =
this.bluetoothApi_.getDeviceForTest(address) || {address: address}; this.bluetoothApi_.getDeviceForTest(address) || {address: address};
device = Object.assign({}, device);
device.paired = true; device.paired = true;
device.connecting = true; device.connecting = true;
this.bluetoothApi_.updateDeviceForTest(device); this.bluetoothApi_.updateDeviceForTest(device);
......
...@@ -33,8 +33,6 @@ ...@@ -33,8 +33,6 @@
-ActiveDirectoryJoinTest.TestActiveDirectoryEnrollment_ErrorCard -ActiveDirectoryJoinTest.TestActiveDirectoryEnrollment_ErrorCard
-ActiveDirectoryJoinTest.TestActiveDirectoryEnrollment_Success -ActiveDirectoryJoinTest.TestActiveDirectoryEnrollment_Success
-ActiveDirectoryJoinTest.TestActiveDirectoryEnrollment_UIErrors -ActiveDirectoryJoinTest.TestActiveDirectoryEnrollment_UIErrors
-CrSettingsBluetoothPageTest.All
-CrSettingsCrostiniPageTest.All
-CrSettingsFingerprintProgressArcTest.All -CrSettingsFingerprintProgressArcTest.All
-CrSettingsMultidevicePageTest.All -CrSettingsMultidevicePageTest.All
-CrSettingsPeoplePageLockScreenTest.All -CrSettingsPeoplePageLockScreenTest.All
...@@ -117,12 +115,14 @@ CrSettingsAnimatedPagesTest.* ...@@ -117,12 +115,14 @@ CrSettingsAnimatedPagesTest.*
CrSettingsAppearanceFontsPageTest.* CrSettingsAppearanceFontsPageTest.*
CrSettingsAppearancePageTest.* CrSettingsAppearancePageTest.*
CrSettingsAutofillSectionTest.* CrSettingsAutofillSectionTest.*
CrSettingsBluetoothPageTest.*
CrSettingsCategoryDefaultSettingTest.* CrSettingsCategoryDefaultSettingTest.*
CrSettingsCategorySettingExceptionsTest.* CrSettingsCategorySettingExceptionsTest.*
CrSettingsCertificateManagerTest.* CrSettingsCertificateManagerTest.*
CrSettingsChangePasswordPageTest.* CrSettingsChangePasswordPageTest.*
CrSettingsCheckboxTest.* CrSettingsCheckboxTest.*
CrSettingsChromeCleanupPageTest.* CrSettingsChromeCleanupPageTest.*
CrSettingsCrostiniPageTest.*
CrSettingsDateTimePageTest.* CrSettingsDateTimePageTest.*
CrSettingsDefaultBrowserTest.* CrSettingsDefaultBrowserTest.*
CrSettingsDevicePageTest.* CrSettingsDevicePageTest.*
......
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