Commit 2deb0960 authored by Aga Wronska's avatar Aga Wronska Committed by Commit Bot

Fix regression: clicking network on the network screen does not continue to the next screen.

Regression was introduced by network screen refacoring at:
https://chromium.googlesource.com/chromium/src/+/1001fd375442428751b18f3fed991c77874b92eb

Bug: 862445, 870227
Test: DemoSetupTest
Change-Id: I993734fe3d62bd6903454208563e60cff1ba702e
Reviewed-on: https://chromium-review.googlesource.com/1157701
Commit-Queue: Aga Wronska <agawronska@chromium.org>
Reviewed-by: default avatarAlexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580563}
parent 03fbfadf
......@@ -45,6 +45,8 @@ constexpr char kIsConfirmationDialogHiddenQuery[] =
"!!document.querySelector('.cr-dialog-container').hidden";
constexpr char kDefaultNetworkServicePath[] = "/service/eth1";
constexpr char kDefaultNetworkName[] = "eth1";
constexpr base::TimeDelta kJsConditionCheckFrequency =
base::TimeDelta::FromMilliseconds(200);
......@@ -618,6 +620,32 @@ IN_PROC_BROWSER_TEST_F(DemoSetupTest, NextDisabledOnNetworkScreen) {
EXPECT_TRUE(IsScreenShown(OobeScreen::SCREEN_OOBE_NETWORK));
}
IN_PROC_BROWSER_TEST_F(DemoSetupTest, ClickNetworkOnNetworkScreen) {
SkipToScreen(OobeScreen::SCREEN_OOBE_NETWORK);
EXPECT_FALSE(IsScreenDialogElementEnabled(
OobeScreen::SCREEN_OOBE_NETWORK, DemoSetupDialog::kNetwork,
ButtonToStringId(OobeButton::kNext)));
ClickNetworkListElement(kDefaultNetworkName);
SimulateNetworkConnected();
OobeScreenWaiter(OobeScreen::SCREEN_OOBE_EULA).Wait();
EXPECT_TRUE(IsScreenShown(OobeScreen::SCREEN_OOBE_EULA));
}
IN_PROC_BROWSER_TEST_F(DemoSetupTest, ClickConnectedNetworkOnNetworkScreen) {
SimulateNetworkConnected();
SkipToScreen(OobeScreen::SCREEN_OOBE_NETWORK);
EXPECT_TRUE(IsScreenDialogElementEnabled(
OobeScreen::SCREEN_OOBE_NETWORK, DemoSetupDialog::kNetwork,
ButtonToStringId(OobeButton::kNext)));
ClickNetworkListElement(kDefaultNetworkName);
OobeScreenWaiter(OobeScreen::SCREEN_OOBE_EULA).Wait();
EXPECT_TRUE(IsScreenShown(OobeScreen::SCREEN_OOBE_EULA));
}
IN_PROC_BROWSER_TEST_F(DemoSetupTest, BackOnNetworkScreen) {
SimulateNetworkConnected();
SkipToScreen(OobeScreen::SCREEN_OOBE_NETWORK);
......
......@@ -166,7 +166,7 @@ Polymer({
*/
onSelectedNetworkConnected_: function() {
this.networkLastSelectedGuid_ = '';
chrome.send('login.WelcomeScreen.userActed', ['continue']);
chrome.send('login.NetworkScreen.userActed', ['continue']);
},
/**
......
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