Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7809)

Unified Diff: chrome/test/data/webui/settings/dropdown_menu_tests.js

Issue 2235093002: Fix Loading text for settings-dropdown-menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/settings/controls/settings_dropdown_menu.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/webui/settings/dropdown_menu_tests.js
diff --git a/chrome/test/data/webui/settings/dropdown_menu_tests.js b/chrome/test/data/webui/settings/dropdown_menu_tests.js
index 77c3768ded422a0a4a0752bf58fe4f5f3ec5307a..a10a09f51d98e939201e9f0b450c79b98dcd095c 100644
--- a/chrome/test/data/webui/settings/dropdown_menu_tests.js
+++ b/chrome/test/data/webui/settings/dropdown_menu_tests.js
@@ -92,6 +92,33 @@ cr.define('settings_dropdown_menu', function() {
// Pref should not have changed.
assertEquals('f', dropdown.pref.value);
});
+
+ test('delay setting options', function testDelayedOptions(done) {
+ dropdown.pref = {
+ key: 'test.number2',
+ type: chrome.settingsPrivate.PrefType.NUMBER,
+ value: 200,
+ };
+
+ setTimeout(function() {
+ assertEquals(
+ loadTimeData.getValue('loading'), dropdown.$.dropdownMenu.label);
+ assertTrue(dropdown.$.dropdownMenu.disabled);
+ assertEquals(undefined, selectable.selected);
+
+ dropdown.menuOptions = [{value: 100, name: 'Option 100'},
+ {value: 200, name: 'Option 200'},
+ {value: 300, name: 'Option 300'},
+ {value: 400, name: 'Option 400'}];
+ Polymer.dom.flush();
+
+ // Dropdown menu enables itself and selects the new menu option
+ // correpsonding to the pref value.
+ assertFalse(dropdown.$.dropdownMenu.disabled);
+ assertEquals('200', selectable.selected);
+ done();
+ }, 100);
+ });
});
}
« no previous file with comments | « chrome/browser/resources/settings/controls/settings_dropdown_menu.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698