Commit f0429d00 authored by Denis Kuznetsov's avatar Denis Kuznetsov Committed by Commit Bot

Set default value for domain on offline sign-in screen

Polymer v2 evaluates i18nDynamic(as it has defined locale param),
but does not evaluate !domain as only one undefined param.

Fixed: 1059735
Change-Id: Ia8ac3a166590e669d77760f1bdd0c1786712c6f7
Bug: 1059735
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2095009
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: default avatarRoman Aleksandrov <raleksandrov@google.com>
Cr-Commit-Position: refs/heads/master@{#748281}
parent 00861a81
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "chrome/browser/chromeos/login/test/guest_session_mixin.h" #include "chrome/browser/chromeos/login/test/guest_session_mixin.h"
#include "chrome/browser/chromeos/login/test/login_manager_mixin.h" #include "chrome/browser/chromeos/login/test/login_manager_mixin.h"
#include "chrome/browser/chromeos/login/test/offline_gaia_test_mixin.h" #include "chrome/browser/chromeos/login/test/offline_gaia_test_mixin.h"
#include "chrome/browser/chromeos/login/test/session_manager_state_waiter.h"
#include "chrome/browser/chromeos/login/ui/login_display_host_webui.h" #include "chrome/browser/chromeos/login/ui/login_display_host_webui.h"
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_constants.h"
...@@ -172,10 +173,13 @@ IN_PROC_BROWSER_TEST_F(LoginTest, PRE_GaiaAuthOffline) { ...@@ -172,10 +173,13 @@ IN_PROC_BROWSER_TEST_F(LoginTest, PRE_GaiaAuthOffline) {
offline_gaia_test_mixin_.PrepareOfflineGaiaLogin(); offline_gaia_test_mixin_.PrepareOfflineGaiaLogin();
} }
// Flaking: https://crbug.com/1023591
IN_PROC_BROWSER_TEST_F(LoginTest, GaiaAuthOffline) { IN_PROC_BROWSER_TEST_F(LoginTest, GaiaAuthOffline) {
offline_gaia_test_mixin_.GoOffline(); offline_gaia_test_mixin_.GoOffline();
offline_gaia_test_mixin_.SignIn(test_user_.account_id, kPassword); offline_gaia_test_mixin_.InitOfflineLogin(test_user_.account_id, kPassword);
offline_gaia_test_mixin_.CheckManagedStatus(false);
offline_gaia_test_mixin_.SubmitGaiaAuthOfflineForm(
test_user_.account_id.GetUserEmail(), kPassword,
true /* wait for sign-in */);
TestSystemTrayIsVisible(false); TestSystemTrayIsVisible(false);
} }
......
...@@ -68,14 +68,14 @@ void OfflineGaiaTestMixin::GoOnline() { ...@@ -68,14 +68,14 @@ void OfflineGaiaTestMixin::GoOnline() {
network_state_test_helper_.reset(); network_state_test_helper_.reset();
} }
void OfflineGaiaTestMixin::SignIn(const AccountId& test_account_id, void OfflineGaiaTestMixin::CheckManagedStatus(bool expected_is_managed) {
const std::string& password) { if (expected_is_managed) {
ASSERT_TRUE((test_account_id.HasAccountIdKey())); test::OobeJS().ExpectVisiblePath(
{"gaia-signin", "offline-gaia", "managedBy"});
InitOfflineLogin(test_account_id, password); } else {
SubmitGaiaAuthOfflineForm(test_account_id.GetUserEmail(), password); test::OobeJS().ExpectHiddenPath(
SessionStateWaiter(session_manager::SessionState::LOGGED_IN_NOT_ACTIVE) {"gaia-signin", "offline-gaia", "managedBy"});
.Wait(); }
} }
void OfflineGaiaTestMixin::InitOfflineLogin(const AccountId& test_account_id, void OfflineGaiaTestMixin::InitOfflineLogin(const AccountId& test_account_id,
...@@ -102,7 +102,8 @@ void OfflineGaiaTestMixin::StartGaiaAuthOffline() { ...@@ -102,7 +102,8 @@ void OfflineGaiaTestMixin::StartGaiaAuthOffline() {
void OfflineGaiaTestMixin::SubmitGaiaAuthOfflineForm( void OfflineGaiaTestMixin::SubmitGaiaAuthOfflineForm(
const std::string& user_email, const std::string& user_email,
const std::string& password) { const std::string& password,
bool wait_for_signin) {
test::OobeJS().ExpectVisiblePath({"gaia-signin", "offline-gaia"}); test::OobeJS().ExpectVisiblePath({"gaia-signin", "offline-gaia"});
test::OobeJS().ExpectHiddenPath({"gaia-signin", "signin-frame-dialog"}); test::OobeJS().ExpectHiddenPath({"gaia-signin", "signin-frame-dialog"});
test::OobeJS() test::OobeJS()
...@@ -129,6 +130,10 @@ void OfflineGaiaTestMixin::SubmitGaiaAuthOfflineForm( ...@@ -129,6 +130,10 @@ void OfflineGaiaTestMixin::SubmitGaiaAuthOfflineForm(
{"gaia-signin", "offline-gaia", "passwordInput"}); {"gaia-signin", "offline-gaia", "passwordInput"});
test::OobeJS().ClickOnPath( test::OobeJS().ClickOnPath(
{"gaia-signin", "offline-gaia", "next-button"}); {"gaia-signin", "offline-gaia", "next-button"});
if (wait_for_signin) {
SessionStateWaiter(session_manager::SessionState::LOGGED_IN_NOT_ACTIVE)
.Wait();
}
} }
} // namespace chromeos } // namespace chromeos
...@@ -34,22 +34,24 @@ class OfflineGaiaTestMixin : public InProcessBrowserTestMixin { ...@@ -34,22 +34,24 @@ class OfflineGaiaTestMixin : public InProcessBrowserTestMixin {
void GoOffline(); void GoOffline();
void GoOnline(); void GoOnline();
// Loads offline GAIA page and signs-in. // Checks if UI displays management notification.
// Expects user to be already registered (probably via LoginManagerMixin). void CheckManagedStatus(bool expected_is_managed);
// Expects networking to be disabled (probably by caling GoOffline())
void SignIn(const AccountId& test_account_id, const std::string& password);
private:
// Initializes UserManager for offline Login. // Initializes UserManager for offline Login.
// Expects networking to be disabled (probably by calling GoOffline())
void InitOfflineLogin(const AccountId& test_account_id, void InitOfflineLogin(const AccountId& test_account_id,
const std::string& password); const std::string& password);
// Triggers Offlige Gaia screen.
void StartGaiaAuthOffline();
// Fills in and submits offline GAIA login. // Fills in and submits offline GAIA login.
// Expects user to be already registered (probably via LoginManagerMixin).
// Optionally waits for sign-in to complete.
void SubmitGaiaAuthOfflineForm(const std::string& user_email, void SubmitGaiaAuthOfflineForm(const std::string& user_email,
const std::string& password); const std::string& password,
bool wait_for_signin);
private:
// Triggers Offlige Gaia screen.
void StartGaiaAuthOffline();
// This is ised to disable networking. // This is ised to disable networking.
std::unique_ptr<chromeos::NetworkStateTestHelper> network_state_test_helper_; std::unique_ptr<chromeos::NetworkStateTestHelper> network_state_test_helper_;
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
domain: { domain: {
type: String, type: String,
value: null,
}, },
emailDomain: String, emailDomain: String,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment