Add scale to settings-slider

chrome/test/data/webui/settings/settings_slider_tests.js

Index: chrome/test/data/webui/settings/settings_slider_tests.js
diff --git a/chrome/test/data/webui/settings/settings_slider_tests.js b/chrome/test/data/webui/settings/settings_slider_tests.js
index 62758704c8b33bb43081930714421181276fa98e..8b0646654f5bc7b3c4d54757672bab6631dd4896 100644
--- a/chrome/test/data/webui/settings/settings_slider_tests.js
+++ b/chrome/test/data/webui/settings/settings_slider_tests.js
@@ -3,124 +3,125 @@
 // found in the LICENSE file.
 
 /** @fileoverview Suite of tests for settings-slider. */
-cr.define('settings_slider', function() {
-  function registerTests() {
-    suite('SettingsSlider', function() {
-      /** @type {!CrSliderElement} */
-      var slider;
-
-      /**
-       * paper-slider instance wrapped by settings-slider.
-       * @type {!PaperSliderElement}
-       */
-      var paperSlider;
-
-      var tickValues = [2, 4, 8, 16, 32, 64, 128];
-
-      setup(function() {
-        PolymerTest.clearBody();
-        slider = document.createElement('settings-slider');
-        slider.pref = {
-          type: chrome.settingsPrivate.PrefType.NUMBER,
-          value: 16,
-        };
-        document.body.appendChild(slider);
-        paperSlider = slider.$$('paper-slider');
-      });
-
-      test('enforce value', function() {
-        // Test that the indicator is not present until after the pref is
-        // enforced.
-        indicator = slider.$$('cr-policy-pref-indicator');
-        assertFalse(!!indicator);
-        slider.pref = {
-          controlledBy: chrome.settingsPrivate.ControlledBy.DEVICE_POLICY,
-          enforcement: chrome.settingsPrivate.Enforcement.ENFORCED,
-          type: chrome.settingsPrivate.PrefType.NUMBER,
-          value: 16,
-        };
-        Polymer.dom.flush();
-        indicator = slider.$$('cr-policy-pref-indicator');
-        assertTrue(!!indicator);
-      });
-
-      test('set value', function() {
-        slider.tickValues = tickValues;
-        slider.set('pref.value', 16);
-        expectEquals(6, paperSlider.max);
-        expectEquals(3, paperSlider.value);
-        expectEquals(3, paperSlider.immediateValue);
-
-        // settings-slider only supports snapping to a range of tick values.
-        // Setting to an in-between value should snap to an indexed value.
-        slider.set('pref.value', 70);
-        expectEquals(5, paperSlider.value);
-        expectEquals(5, paperSlider.immediateValue);
-        expectEquals(64, slider.pref.value);
-
-        // Setting the value out-of-range should clamp the slider.
-        slider.set('pref.value', -100);
-        expectEquals(0, paperSlider.value);
-        expectEquals(0, paperSlider.immediateValue);
-        expectEquals(2, slider.pref.value);
-      });
-
-      test('move slider', function() {
-        slider.tickValues = tickValues;
-        slider.set('pref.value', 30);
-        expectEquals(4, paperSlider.value);
-
-        MockInteractions.pressAndReleaseKeyOn(
-            paperSlider, 39 /* right */);
-        expectEquals(5, paperSlider.value);
-        expectEquals(64, slider.pref.value);
-
-        MockInteractions.pressAndReleaseKeyOn(
-            paperSlider, 39 /* right */);
-        expectEquals(6, paperSlider.value);
-        expectEquals(128, slider.pref.value);
-
-        MockInteractions.pressAndReleaseKeyOn(
-            paperSlider, 39 /* right */);
-        expectEquals(6, paperSlider.value);
-        expectEquals(128, slider.pref.value);
-
-        MockInteractions.pressAndReleaseKeyOn(
-            paperSlider, 37 /* left */);
-        expectEquals(5, paperSlider.value);
-        expectEquals(64, slider.pref.value);
-      });
-
-      test('findNearestIndex_', function() {
-        var slider = document.createElement('settings-slider');
-        var testArray = [80, 20, 350, 1000, 200, 100];
-        var testFindNearestIndex = function(expectedIndex, value) {
-          expectEquals(
-              expectedIndex, slider.findNearestIndex_(testArray, value));
-        };
-        testFindNearestIndex(0, 51);
-        testFindNearestIndex(0, 80);
-        testFindNearestIndex(0, 89);
-        testFindNearestIndex(1, -100);
-        testFindNearestIndex(1, 20);
-        testFindNearestIndex(1, 49);
-        testFindNearestIndex(2, 400);
-        testFindNearestIndex(2, 350);
-        testFindNearestIndex(2, 300);
-        testFindNearestIndex(3, 200000);
-        testFindNearestIndex(3, 1000);
-        testFindNearestIndex(3, 700);
-        testFindNearestIndex(4, 220);
-        testFindNearestIndex(4, 200);
-        testFindNearestIndex(4, 151);
-        testFindNearestIndex(5, 149);
-        testFindNearestIndex(5, 100);
-        testFindNearestIndex(5, 91);
-      });
-    });
-  }
-
-  return {
-    registerTests: registerTests,
-  };
+suite('SettingsSlider', function() {
+  /** @type {!CrSliderElement} */
+  var slider;
+
+  /**
+   * paper-slider instance wrapped by settings-slider.
+   * @type {!PaperSliderElement}
+   */
+  var paperSlider;
+
+  var tickValues = [2, 4, 8, 16, 32, 64, 128];
+
+  setup(function() {
+    PolymerTest.clearBody();
+    slider = document.createElement('settings-slider');
+    slider.pref = {
+      type: chrome.settingsPrivate.PrefType.NUMBER,
+      value: 16,
+    };
+    document.body.appendChild(slider);
+    paperSlider = slider.$$('paper-slider');
+  });
+
+  test('enforce value', function() {
+    // Test that the indicator is not present until after the pref is
+    // enforced.
+    indicator = slider.$$('cr-policy-pref-indicator');
+    assertFalse(!!indicator);
+    slider.pref = {
+      controlledBy: chrome.settingsPrivate.ControlledBy.DEVICE_POLICY,
+      enforcement: chrome.settingsPrivate.Enforcement.ENFORCED,
+      type: chrome.settingsPrivate.PrefType.NUMBER,
+      value: 16,
+    };
+    Polymer.dom.flush();
+    indicator = slider.$$('cr-policy-pref-indicator');
+    assertTrue(!!indicator);
+  });
+
+  test('set value', function() {
+    slider.tickValues = tickValues;
+    slider.set('pref.value', 16);
+    expectEquals(6, paperSlider.max);
+    expectEquals(3, paperSlider.value);
+    expectEquals(3, paperSlider.immediateValue);
+
+    // settings-slider only supports snapping to a range of tick values.
+    // Setting to an in-between value should snap to an indexed value.
+    slider.set('pref.value', 70);
+    expectEquals(5, paperSlider.value);
+    expectEquals(5, paperSlider.immediateValue);
+    expectEquals(64, slider.pref.value);
+
+    // Setting the value out-of-range should clamp the slider.
+    slider.set('pref.value', -100);
+    expectEquals(0, paperSlider.value);
+    expectEquals(0, paperSlider.immediateValue);
+    expectEquals(2, slider.pref.value);
+  });
+
+  test('move slider', function() {
+    slider.tickValues = tickValues;
+    slider.set('pref.value', 30);
+    expectEquals(4, paperSlider.value);
+
+    MockInteractions.pressAndReleaseKeyOn(paperSlider, 39 /* right */);
+    expectEquals(5, paperSlider.value);
+    expectEquals(64, slider.pref.value);
+
+    MockInteractions.pressAndReleaseKeyOn(paperSlider, 39 /* right */);
+    expectEquals(6, paperSlider.value);
+    expectEquals(128, slider.pref.value);
+
+    MockInteractions.pressAndReleaseKeyOn(paperSlider, 39 /* right */);
+    expectEquals(6, paperSlider.value);
+    expectEquals(128, slider.pref.value);
+
+    MockInteractions.pressAndReleaseKeyOn(paperSlider, 37 /* left */);
+    expectEquals(5, paperSlider.value);
+    expectEquals(64, slider.pref.value);
+  });
+
+  test('findNearestIndex_', function() {
+    var slider = document.createElement('settings-slider');
+    var testArray = [80, 20, 350, 1000, 200, 100];
+    var testFindNearestIndex = function(expectedIndex, value) {
+      expectEquals(expectedIndex, slider.findNearestIndex_(testArray, value));
+    };
+    testFindNearestIndex(0, 51);
+    testFindNearestIndex(0, 80);
+    testFindNearestIndex(0, 89);
+    testFindNearestIndex(1, -100);
+    testFindNearestIndex(1, 20);
+    testFindNearestIndex(1, 49);
+    testFindNearestIndex(2, 400);
+    testFindNearestIndex(2, 350);
+    testFindNearestIndex(2, 300);
+    testFindNearestIndex(3, 200000);
+    testFindNearestIndex(3, 1000);
+    testFindNearestIndex(3, 700);
+    testFindNearestIndex(4, 220);
+    testFindNearestIndex(4, 200);
+    testFindNearestIndex(4, 151);
+    testFindNearestIndex(5, 149);
+    testFindNearestIndex(5, 100);
+    testFindNearestIndex(5, 91);
+  });
+
+  test('scaled slider', function() {
+    slider.scale = 10;
+    slider.set('pref.value', 1);

[michaelpg, 2017/05/15 19:53:18]

please add tests for:

* tickValues being used, causing scale to be ignored or expecting an assert
* a pref value other than 1. this test would pass if the element just sets the
slider value to |this.scale|!

[stevenjb, 2017/05/15 21:45:09]

1. I'm not a fan of testing asserts (now that we have one).
2. Done.

+    expectEquals(10, paperSlider.value);
+
+    MockInteractions.pressAndReleaseKeyOn(paperSlider, 39 /* right */);
+    expectEquals(11, paperSlider.value);
+    expectEquals(1.1, slider.pref.value);
+
+    MockInteractions.pressAndReleaseKeyOn(paperSlider, 39 /* right */);
+    expectEquals(12, paperSlider.value);
+    expectEquals(1.2, slider.pref.value);
+  });
 });