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

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

Issue 14325003: Clean up managed user settings dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix broken merge Created 7 years, 8 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/browser/ui/webui/options/managed_user_settings_browsertest.js
diff --git a/chrome/browser/ui/webui/options/managed_user_settings_browsertest.js b/chrome/browser/ui/webui/options/managed_user_settings_browsertest.js
index f791e6d2af492c12706e02cb5cb2b20b76d12e22..9b0d7c7af7f93bdaf39f15fe5adbde067852e3b1 100644
--- a/chrome/browser/ui/webui/options/managed_user_settings_browsertest.js
+++ b/chrome/browser/ui/webui/options/managed_user_settings_browsertest.js
@@ -33,14 +33,11 @@ ManagedUserSettingsTest.prototype = {
};
-// Verify that the settings page is locked when a passphrase is specified.
+// Verify that the settings page is locked and can be unlocked.
TEST_F('ManagedUserSettingsTest', 'PageLocked',
function() {
- // Check that the user is not authenticated when a passphrase is set.
- ManagedUserSettings.passphraseChanged(true);
var instance = ManagedUserSettings.getInstance();
- expectEquals(instance.authenticationState,
- options.ManagedUserAuthentication.UNAUTHENTICATED);
+ expectFalse(instance.isAuthenticated);
// Now verify that the unlock button can be clicked.
var unlockButton =
options.ManagedUserSettingsForTesting.getUnlockButton();
@@ -51,16 +48,3 @@ TEST_F('ManagedUserSettingsTest', 'PageLocked',
this.mockHandler.expects(once()).setElevated([false]);
OptionsPage.closeOverlay();
});
-
-// Verify that the settings page is also locked when no passphrase is specified.
-TEST_F('ManagedUserSettingsTest', 'PageLockedNoPassphrase',
- function() {
- var instance = ManagedUserSettings.getInstance();
- expectEquals(instance.authenticationState,
- options.ManagedUserAuthentication.UNAUTHENTICATED);
- var unlockButton =
- options.ManagedUserSettingsForTesting.getUnlockButton();
- expectFalse(unlockButton.disabled);
- this.mockHandler.expects(once()).setElevated([false]);
- OptionsPage.closeOverlay();
- });

Powered by Google App Engine
This is Rietveld 408576698