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

Unified Diff: chrome/browser/ui/webui/options/language_options_browsertest.js

Issue 168183002: options: prettier fix for bug 281069 that can be committed to trunk later. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: test fixes + merge Created 6 years, 10 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/options/language_options.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/language_options_browsertest.js
diff --git a/chrome/browser/ui/webui/options/language_options_browsertest.js b/chrome/browser/ui/webui/options/language_options_browsertest.js
index e326d82c070e7920dae62feba0d72eb1a086e220..dd3cd8943cd9521e29cbe71748783f317013d360 100644
--- a/chrome/browser/ui/webui/options/language_options_browsertest.js
+++ b/chrome/browser/ui/webui/options/language_options_browsertest.js
@@ -1,24 +1,36 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
/**
- * TestFixture for languages options WebUI testing.
+ * TestFixture for language options WebUI testing.
* @extends {testing.Test}
* @constructor
- **/
-function LanguagesOptionsWebUITest() {}
+ */
+function LanguageOptionsWebUITest() {}
-LanguagesOptionsWebUITest.prototype = {
+LanguageOptionsWebUITest.prototype = {
__proto__: testing.Test.prototype,
- /**
- * Browse to languages options.
- **/
+ /** @override */
browsePreload: 'chrome://settings-frame/languages',
};
-// Test opening languages options has correct location.
-TEST_F('LanguagesOptionsWebUITest', 'testOpenLanguagesOptions', function() {
+// Test opening language options has correct location.
+TEST_F('LanguageOptionsWebUITest', 'testOpenLanguageOptions', function() {
assertEquals(this.browsePreload, document.location.href);
});
+
+GEN('#if defined(OS_WIN) || defined(OS_CHROMEOS)');
+// Test reselecting the same language as the current UI locale. This should show
+// a "Chrome is displayed in this language" message rather than a restart banner
+// or a [ Display Chrome in this language ] button.
+TEST_F('LanguageOptionsWebUITest', 'reselectUILocale', function() {
+ var currentLang = loadTimeData.getString('currentUiLanguageCode');
+ LanguageOptions.uiLanguageSaved(currentLang);
+
+ expectTrue($('language-options-ui-language-button').hidden);
+ expectFalse($('language-options-ui-language-message').hidden);
+ expectTrue($('language-options-ui-notification-bar').hidden);
+});
+GEN('#endif'); // defined(OS_WIN) || defined(OS_CHROMEOS)
« no previous file with comments | « chrome/browser/resources/options/language_options.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698