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

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

Issue 1967913002: Material WebUI: cr-slider element for intelligent range mapping (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@KeyboardFinish
Patch Set: Created 4 years, 7 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
Index: chrome/test/data/webui/settings/device_page_tests.js
diff --git a/chrome/test/data/webui/settings/device_page_tests.js b/chrome/test/data/webui/settings/device_page_tests.js
index 0be90aaacd90b8ce6acc4116de558fdd5a888340..3e9d7ceb55426b0dbf51b8fcb1dd2d66783ef8cb 100644
--- a/chrome/test/data/webui/settings/device_page_tests.js
+++ b/chrome/test/data/webui/settings/device_page_tests.js
@@ -217,8 +217,8 @@ cr.define('settings_device_page', function() {
expectTrue(collapse.opened);
// Values are based on indices of auto-repeat options in keyboard.js.
- expectEquals(keyboardPage.$.delaySlider.immediateValue, 3);
- expectEquals(keyboardPage.$.repeatRateSlider.immediateValue, 2);
+ expectEquals(3, keyboardPage.$.delaySlider.value);
+ expectEquals(2, keyboardPage.$.repeatRateSlider.value);
// Test interaction with slider.
MockInteractions.pressAndReleaseKeyOn(
@@ -226,26 +226,28 @@ cr.define('settings_device_page', function() {
MockInteractions.pressAndReleaseKeyOn(
keyboardPage.$.repeatRateSlider, 39 /* right */);
expectEquals(
- fakePrefs.settings.language.xkb_auto_repeat_delay_r2.value, 1000);
+ 1000, fakePrefs.settings.language.xkb_auto_repeat_delay_r2.value);
expectEquals(
- fakePrefs.settings.language.xkb_auto_repeat_interval_r2.value,
- 300);
+ 300,
+ fakePrefs.settings.language.xkb_auto_repeat_interval_r2.value);
// Test sliders change when prefs change.
+ console.log('Setting auto_repeat_delay value to 1500');
devicePage.set(
'prefs.settings.language.xkb_auto_repeat_delay_r2.value', 1500);
- expectEquals(keyboardPage.$.delaySlider.immediateValue, 1);
+ expectEquals(1, keyboardPage.$.delaySlider.immediateValue);
+ return;
devicePage.set(
'prefs.settings.language.xkb_auto_repeat_interval_r2.value', 2000);
- expectEquals(keyboardPage.$.repeatRateSlider.immediateValue, 0);
+ expectEquals(0, keyboardPage.$.repeatRateSlider.immediateValue);
// Test sliders round to nearest value when prefs change.
devicePage.set(
'prefs.settings.language.xkb_auto_repeat_delay_r2.value', 600);
- expectEquals(keyboardPage.$.delaySlider.immediateValue, 3 /* 500 */);
+ expectEquals(3 /* 500 */, keyboardPage.$.delaySlider.immediateValue);
devicePage.set(
'prefs.settings.language.xkb_auto_repeat_interval_r2.value', 45);
- expectEquals(keyboardPage.$.repeatRateSlider.immediateValue, 6 /* 50 */);
+ expectEquals(6 /* 50 */, keyboardPage.$.repeatRateSlider.immediateValue);
devicePage.set(
'prefs.settings.language.xkb_auto_repeat_enabled_r2.value', false);

Powered by Google App Engine
This is Rietveld 408576698