MD Settings: Polish for Languages main page

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('settings-languages', function() {
   /**
    * Data-binds two Polymer properties using the property-changed events and
    * set/notifyPath API. Useful for testing components which would normally be
    * used together.
    * @param {!HTMLElement} el1
@@ skipping 45 matching lines @@
         });
         fakePrefs.push({
           key: 'settings.language.enabled_extension_imes',
           type: chrome.settingsPrivate.PrefType.STRING,
           value: '',
         });
       }
       return fakePrefs;
     }
 
+    /**
+     * @param {!Array<string>} expected
+     */
+    function assertLanguageOrder(expected) {
+      assertEquals(expected.length, languageHelper.languages.enabled.length);
+      for (var i = 0; i < expected.length; i++) {
+        assertEquals(
+            expected[i], languageHelper.languages.enabled[i].language.code);
+      }
+    }
+
     var languageHelper;
     var languageSettingsPrivate;
 
     suiteSetup(function() {
       CrSettingsPrefs.deferInitialization = true;
     });
 
     setup(function() {
       var settingsPrefs = document.createElement('settings-prefs');
       var settingsPrivate = new settings.FakeSettingsPrivate(getFakePrefs());
@@ skipping 10 matching lines @@
 
       return languageHelper.whenReady();
     });
 
     test('languages model', function() {
       for (var i = 0; i < languageSettingsPrivate.languages.length;
            i++) {
         assertEquals(languageSettingsPrivate.languages[i].code,
                      languageHelper.languages.supported[i].code);
       }
-      assertEquals(2, languageHelper.languages.enabled.length);
-      assertEquals('en-US',
-                   languageHelper.languages.enabled[0].language.code);
-      assertEquals('sw',
-                   languageHelper.languages.enabled[1].language.code);
+      assertLanguageOrder(['en-US', 'sw']);
       assertEquals('en', languageHelper.languages.translateTarget);
 
       // TODO(michaelpg): Test other aspects of the model.
     });
 
     test('modifying languages', function() {
       assertTrue(languageHelper.isLanguageEnabled('en-US'));
       assertTrue(languageHelper.isLanguageEnabled('sw'));
       assertFalse(languageHelper.isLanguageEnabled('en-CA'));
 
       languageHelper.enableLanguage('en-CA');
       assertTrue(languageHelper.isLanguageEnabled('en-CA'));
       languageHelper.disableLanguage('sw');
       assertFalse(languageHelper.isLanguageEnabled('sw'));
 
       // TODO(michaelpg): Test other modifications.
     });
 
     test('reorder languages', function() {
+      // New language is added at the end.
       languageHelper.enableLanguage('en-CA');
-      assertEquals('en-US', languageHelper.languages.enabled[0].language.code);
-      assertEquals('sw', languageHelper.languages.enabled[1].language.code);
-      assertEquals('en-CA', languageHelper.languages.enabled[2].language.code);
+      assertLanguageOrder(['en-US', 'sw', 'en-CA']);
 
       // Can move a language up.
       languageHelper.moveLanguage('en-CA', -1);
-      assertEquals('en-US', languageHelper.languages.enabled[0].language.code);
-      assertEquals('en-CA', languageHelper.languages.enabled[1].language.code);
-      assertEquals('sw', languageHelper.languages.enabled[2].language.code);
+      assertLanguageOrder(['en-US', 'en-CA', 'sw']);
 
       // Can move a language down.
       languageHelper.moveLanguage('en-US', 1);
-      assertEquals('en-CA', languageHelper.languages.enabled[0].language.code);
-      assertEquals('en-US', languageHelper.languages.enabled[1].language.code);
-      assertEquals('sw', languageHelper.languages.enabled[2].language.code);
+      assertLanguageOrder(['en-CA', 'en-US', 'sw']);
+
+      // Can move a language to the front.
+      languageHelper.moveLanguageToFront('sw');
+      var expectedOrder = ['sw', 'en-CA', 'en-US'];
+      assertLanguageOrder(expectedOrder);
 
       // Moving the first language up has no effect.
-      languageHelper.moveLanguage('en-CA', -1);
-      assertEquals('en-CA', languageHelper.languages.enabled[0].language.code);
-      assertEquals('en-US', languageHelper.languages.enabled[1].language.code);
-      assertEquals('sw', languageHelper.languages.enabled[2].language.code);
+      languageHelper.moveLanguage('sw', -1);
+      assertLanguageOrder(expectedOrder);
+
+      // Moving the first language to top has no effect.
+      languageHelper.moveLanguageToFront('sw');
+      assertLanguageOrder(expectedOrder);
 
       // Moving the last language down has no effect.
-      languageHelper.moveLanguage('sw', 1);
-      assertEquals('en-CA', languageHelper.languages.enabled[0].language.code);
-      assertEquals('en-US', languageHelper.languages.enabled[1].language.code);
-      assertEquals('sw', languageHelper.languages.enabled[2].language.code);
+      languageHelper.moveLanguage('en-US', 1);
+      assertLanguageOrder(expectedOrder);
     });
 
     if (cr.isChromeOS) {
       test('modifying input methods', function() {
         assertEquals(2, languageHelper.languages.inputMethods.enabled.length);
         var inputMethods = languageHelper.getInputMethodsForLanguage('en-US');
         assertEquals(3, inputMethods.length);
 
         // We can remove one input method.
         var dvorak =
@@ skipping 19 matching lines @@
         // The US Swahili keyboard should still be enabled, because it supports
         // English which is still enabled.
         assertTrue(languageHelper.languages.inputMethods.enabled.some(
               function(inputMethod) {
                 return inputMethod.id == swUS;
               }));
       });
     }
   });
 });