Index: chrome/test/data/webui/settings/about_page_tests.js |
diff --git a/chrome/test/data/webui/settings/about_page_tests.js b/chrome/test/data/webui/settings/about_page_tests.js |
index 60c255c4cb483e5602bac8ede1801c5e6b6afa62..07f3e54fecf1385a8931590823b4735ad181278d 100644 |
--- a/chrome/test/data/webui/settings/about_page_tests.js |
+++ b/chrome/test/data/webui/settings/about_page_tests.js |
@@ -171,40 +171,47 @@ cr.define('settings_about_page', function() { |
} |
/** |
- * Test that the status icon updates according to incoming |
- * 'update-status-changed' events. |
+ * Test that the status icon and status message update according to |
+ * incoming 'update-status-changed' events. |
*/ |
- test('IconUpdates', function() { |
+ test('IconAndMessageUpdates', function() { |
var icon = page.$$('iron-icon'); |
assertTrue(!!icon); |
+ var statusMessageEl = page.$.updateStatusMessage; |
+ var previousMessageText = statusMessageEl.textContent; |
fireStatusChanged(UpdateStatus.CHECKING); |
assertEquals(SPINNER_ICON, icon.src); |
assertEquals(null, icon.getAttribute('icon')); |
+ assertNotEquals(previousMessageText, statusMessageEl.textContent); |
+ previousMessageText = statusMessageEl.textContent; |
fireStatusChanged(UpdateStatus.UPDATING); |
assertEquals(SPINNER_ICON, icon.src); |
assertEquals(null, icon.getAttribute('icon')); |
+ assertNotEquals(previousMessageText, statusMessageEl.textContent); |
+ previousMessageText = statusMessageEl.textContent; |
fireStatusChanged(UpdateStatus.NEARLY_UPDATED); |
assertEquals(null, icon.src); |
assertEquals('settings:check-circle', icon.icon); |
- |
- fireStatusChanged(UpdateStatus.NEARLY_UPDATED); |
- assertEquals(null, icon.src); |
- assertEquals('settings:check-circle', icon.icon); |
+ assertNotEquals(previousMessageText, statusMessageEl.textContent); |
+ previousMessageText = statusMessageEl.textContent; |
fireStatusChanged(UpdateStatus.DISABLED_BY_ADMIN); |
assertEquals(null, icon.src); |
assertEquals('cr:domain', icon.icon); |
+ assertEquals(0, statusMessageEl.textContent.trim().length); |
fireStatusChanged(UpdateStatus.FAILED); |
assertEquals(null, icon.src); |
assertEquals('settings:error', icon.icon); |
+ assertEquals(0, statusMessageEl.textContent.trim().length); |
fireStatusChanged(UpdateStatus.DISABLED); |
assertEquals(null, icon.src); |
assertEquals(null, icon.getAttribute('icon')); |
+ assertEquals(0, statusMessageEl.textContent.trim().length); |
}); |
/** |