| Index: chrome/test/data/webui/settings/people_page_sync_page_test.js
|
| diff --git a/chrome/test/data/webui/settings/people_page_sync_page_test.js b/chrome/test/data/webui/settings/people_page_sync_page_test.js
|
| index 87a04afa1d16b82606e2e350e824a4b2c4347865..fe8be556e735f9a144be7c80ccd3846bd6991f4f 100644
|
| --- a/chrome/test/data/webui/settings/people_page_sync_page_test.js
|
| +++ b/chrome/test/data/webui/settings/people_page_sync_page_test.js
|
| @@ -112,7 +112,9 @@ cr.define('settings_people_page_sync_page', function() {
|
|
|
| cr.webUIListenerCallback('page-status-changed',
|
| settings.PageStatus.CONFIGURE);
|
| - assertEquals(settings.PageStatus.CONFIGURE, syncPage.$.pages.selected);
|
| + assertFalse(syncPage.$$('#' + settings.PageStatus.CONFIGURE).hidden);
|
| + assertTrue(syncPage.$$('#' + settings.PageStatus.TIMEOUT).hidden);
|
| + assertTrue(syncPage.$$('#' + settings.PageStatus.SPINNER).hidden);
|
|
|
| // Start with Sync All with no encryption selected.
|
| cr.webUIListenerCallback('sync-prefs-changed', getSyncAllPrefs());
|
| @@ -163,20 +165,34 @@ cr.define('settings_people_page_sync_page', function() {
|
| }),
|
|
|
| test('LoadingAndTimeout', function() {
|
| + var configurePage = syncPage.$$('#' + settings.PageStatus.CONFIGURE);
|
| + var spinnerPage = syncPage.$$('#' + settings.PageStatus.SPINNER);
|
| + var timeoutPage = syncPage.$$('#' + settings.PageStatus.TIMEOUT);
|
| +
|
| cr.webUIListenerCallback('page-status-changed',
|
| settings.PageStatus.SPINNER);
|
| - assertEquals(settings.PageStatus.SPINNER, syncPage.$.pages.selected);
|
| + assertTrue(configurePage.hidden);
|
| + assertTrue(timeoutPage.hidden);
|
| + assertFalse(spinnerPage.hidden);
|
| +
|
| cr.webUIListenerCallback('page-status-changed',
|
| settings.PageStatus.TIMEOUT);
|
| - assertEquals(settings.PageStatus.TIMEOUT, syncPage.$.pages.selected);
|
| + assertTrue(configurePage.hidden);
|
| + assertFalse(timeoutPage.hidden);
|
| + assertTrue(spinnerPage.hidden);
|
| +
|
| cr.webUIListenerCallback('page-status-changed',
|
| settings.PageStatus.CONFIGURE);
|
| - assertEquals(settings.PageStatus.CONFIGURE, syncPage.$.pages.selected);
|
| + assertFalse(configurePage.hidden);
|
| + assertTrue(timeoutPage.hidden);
|
| + assertTrue(spinnerPage.hidden);
|
|
|
| // Should remain on the CONFIGURE page even if the passphrase failed.
|
| cr.webUIListenerCallback('page-status-changed',
|
| settings.PageStatus.PASSPHRASE_FAILED);
|
| - assertEquals(settings.PageStatus.CONFIGURE, syncPage.$.pages.selected);
|
| + assertFalse(configurePage.hidden);
|
| + assertTrue(timeoutPage.hidden);
|
| + assertTrue(spinnerPage.hidden);
|
| });
|
|
|
| test('SettingIndividualDatatypes', function() {
|
|
|