summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralemate@chromium.org <alemate@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-12 12:51:48 +0000
committeralemate@chromium.org <alemate@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-12 12:51:48 +0000
commitdd1ae25d386049557ae066fdb4b148c1297c3d1e (patch)
treec2e6c7b5087581689c052498ad347e0131f7b95e
parente8d6c587a1284f339290c656eff057742ced081b (diff)
downloadchromium_src-dd1ae25d386049557ae066fdb4b148c1297c3d1e.zip
chromium_src-dd1ae25d386049557ae066fdb4b148c1297c3d1e.tar.gz
chromium_src-dd1ae25d386049557ae066fdb4b148c1297c3d1e.tar.bz2
Add error messsage bubble flag for tests.
Tests checking for eroro message buble can be flaky, because on-screen message can disappear before test checks for it. This CL adds special flag for tests. BUG=339348 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=268924 Review URL: https://codereview.chromium.org/268373002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269773 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/login/display_manager.js10
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/resources/login/display_manager.js b/chrome/browser/resources/login/display_manager.js
index 3644beb1..d611267 100644
--- a/chrome/browser/resources/login/display_manager.js
+++ b/chrome/browser/resources/login/display_manager.js
@@ -178,6 +178,11 @@ cr.define('cr.ui.login', function() {
*/
displayType_: DISPLAY_TYPE.UNKNOWN,
+ /**
+ * Error message (bubble) was shown. This is checked in tests.
+ */
+ errorMessageWasShownForTesting_: false,
+
get displayType() {
return this.displayType_;
},
@@ -876,8 +881,10 @@ cr.define('cr.ui.login', function() {
}
var currentScreen = Oobe.getInstance().currentScreen;
- if (currentScreen && typeof currentScreen.showErrorBubble === 'function')
+ if (currentScreen && typeof currentScreen.showErrorBubble === 'function') {
currentScreen.showErrorBubble(loginAttempts, error);
+ this.errorMessageWasShownForTesting_ = true;
+ }
};
/**
@@ -907,6 +914,7 @@ cr.define('cr.ui.login', function() {
*/
DisplayManager.clearErrors = function() {
$('bubble').hide();
+ this.errorMessageWasShownForTesting_ = false;
};
/**