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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/reset_browsertest.cc

Issue 491263002: UI flow rework for device reset options. Reset made available from gaia screen. Tests adapted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ShowAndCancelTest fixed. Created 6 years, 3 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/app/chromeos_strings.grdp ('k') | chrome/browser/chromeos/login/ui/webui_login_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/reset_browsertest.cc
diff --git a/chrome/browser/chromeos/login/reset_browsertest.cc b/chrome/browser/chromeos/login/reset_browsertest.cc
index 4c9ecb1a9f81d5a3d079af8b280b7131dd2c7993..f9c2577377f0113d0096aecf296d1c1d993d8123 100644
--- a/chrome/browser/chromeos/login/reset_browsertest.cc
+++ b/chrome/browser/chromeos/login/reset_browsertest.cc
@@ -74,6 +74,11 @@ class ResetTest : public LoginManagerTest {
OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_RESET).Wait();
}
+ void InvokeRollbackOption() {
+ ASSERT_TRUE(JSExecuted(
+ "cr.ui.Oobe.handleAccelerator('show_rollback_on_reset_screen');"));
+ }
+
void CloseResetScreen() {
ASSERT_TRUE(JSExecuted("$('reset-cancel-button').click();"));
}
@@ -82,6 +87,13 @@ class ResetTest : public LoginManagerTest {
ASSERT_TRUE(JSExecuted("$('reset-button').click();"));
}
+ void ClickRestartButton() {
+ ASSERT_TRUE(JSExecuted("$('reset-restart-button').click();"));
+ }
+ void ClickToConfirmButton() {
+ ASSERT_TRUE(JSExecuted("$('reset-toconfirm-button').click();"));
+ }
+
FakeUpdateEngineClient* update_engine_client_;
FakeSessionManagerClient* session_manager_client_;
FakePowerManagerClient* power_manager_client_;
@@ -104,12 +116,10 @@ IN_PROC_BROWSER_TEST_F(ResetTest, PRE_ShowAndCancel) {
IN_PROC_BROWSER_TEST_F(ResetTest, ShowAndCancel) {
JSExpect("!!document.querySelector('#reset.hidden')");
- EXPECT_EQ(0, update_engine_client_->can_rollback_call_count());
InvokeResetScreen();
JSExpect("!document.querySelector('#reset.hidden')");
CloseResetScreen();
JSExpect("!!document.querySelector('#reset.hidden')");
- EXPECT_EQ(1, update_engine_client_->can_rollback_call_count());
}
IN_PROC_BROWSER_TEST_F(ResetTest, PRE_RestartBeforePowerwash) {
@@ -122,38 +132,16 @@ IN_PROC_BROWSER_TEST_F(ResetTest, RestartBeforePowerwash) {
InvokeResetScreen();
EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
EXPECT_EQ(0, session_manager_client_->start_device_wipe_call_count());
- ClickResetButton();
+ ClickRestartButton();
ASSERT_EQ(1, power_manager_client_->num_request_restart_calls());
ASSERT_EQ(0, session_manager_client_->start_device_wipe_call_count());
- EXPECT_FALSE(prefs->GetBoolean(prefs::kRollbackRequested));
- EXPECT_TRUE(prefs->GetBoolean(prefs::kFactoryResetRequested));
-}
-
-IN_PROC_BROWSER_TEST_F(ResetTest, PRE_RestartBeforeRollback) {
- RegisterSomeUser();
- update_engine_client_->set_can_rollback_check_result(true);
-}
-
-IN_PROC_BROWSER_TEST_F(ResetTest, RestartBeforeRollback) {
- PrefService* prefs = g_browser_process->local_state();
-
- InvokeResetScreen();
- EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
- EXPECT_EQ(0, session_manager_client_->start_device_wipe_call_count());
- ASSERT_TRUE(content::ExecuteScript(
- web_contents(),
- "$('reset-rollback-checkbox').checked = true;"));
- ClickResetButton();
- ASSERT_EQ(1, power_manager_client_->num_request_restart_calls());
- ASSERT_EQ(0, session_manager_client_->start_device_wipe_call_count());
- EXPECT_EQ(0, update_engine_client_->rollback_call_count());
-
- EXPECT_TRUE(prefs->GetBoolean(prefs::kRollbackRequested));
EXPECT_TRUE(prefs->GetBoolean(prefs::kFactoryResetRequested));
}
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, PRE_ShortcutInvokedCases) {
+ PrefService* prefs = g_browser_process->local_state();
+ prefs->SetBoolean(prefs::kFactoryResetRequested, true);
RegisterSomeUser();
}
@@ -164,6 +152,8 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, ShortcutInvokedCases) {
EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
EXPECT_EQ(0, session_manager_client_->start_device_wipe_call_count());
EXPECT_EQ(0, update_engine_client_->rollback_call_count());
+ InvokeRollbackOption();
+ ClickToConfirmButton();
ClickResetButton();
EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
EXPECT_EQ(1, session_manager_client_->start_device_wipe_call_count());
@@ -171,9 +161,12 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, ShortcutInvokedCases) {
CloseResetScreen();
OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait();
+ PrefService* prefs = g_browser_process->local_state();
+ prefs->SetBoolean(prefs::kFactoryResetRequested, true);
update_engine_client_->set_can_rollback_check_result(true);
// rollback available and unchecked
InvokeResetScreen();
+ ClickToConfirmButton();
ClickResetButton();
EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
EXPECT_EQ(2, session_manager_client_->start_device_wipe_call_count());
@@ -181,11 +174,11 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, ShortcutInvokedCases) {
CloseResetScreen();
OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait();
+ prefs->SetBoolean(prefs::kFactoryResetRequested, true);
// rollback available and checked
InvokeResetScreen();
- ASSERT_TRUE(content::ExecuteScript(
- web_contents(),
- "$('reset-rollback-checkbox').checked = true;"));
+ InvokeRollbackOption();
+ ClickToConfirmButton();
ClickResetButton();
EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
EXPECT_EQ(2, session_manager_client_->start_device_wipe_call_count());
@@ -194,7 +187,6 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, ShortcutInvokedCases) {
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, PRE_PowerwashRequested) {
PrefService* prefs = g_browser_process->local_state();
- prefs->SetBoolean(prefs::kRollbackRequested, false);
prefs->SetBoolean(prefs::kFactoryResetRequested, true);
RegisterSomeUser();
}
@@ -204,6 +196,10 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, PowerwashRequested) {
EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
EXPECT_EQ(0, session_manager_client_->start_device_wipe_call_count());
EXPECT_EQ(0, update_engine_client_->rollback_call_count());
+ ClickToConfirmButton();
+ EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
+ EXPECT_EQ(0, session_manager_client_->start_device_wipe_call_count());
+ EXPECT_EQ(0, update_engine_client_->rollback_call_count());
ClickResetButton();
EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
EXPECT_EQ(1, session_manager_client_->start_device_wipe_call_count());
@@ -212,22 +208,24 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, PowerwashRequested) {
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, PRE_ErrorOnRollbackRequested) {
PrefService* prefs = g_browser_process->local_state();
- prefs->SetBoolean(prefs::kRollbackRequested, true);
prefs->SetBoolean(prefs::kFactoryResetRequested, true);
RegisterSomeUser();
}
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, ErrorOnRollbackRequested) {
+ update_engine_client_->set_can_rollback_check_result(true);
OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_RESET).Wait();
EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
EXPECT_EQ(0, session_manager_client_->start_device_wipe_call_count());
EXPECT_EQ(0, update_engine_client_->rollback_call_count());
- JSExpect("!$('reset').classList.contains('revert-promise')");
+ JSExpect("!$('reset').classList.contains('revert-promise-view')");
+ InvokeRollbackOption();
+ ClickToConfirmButton();
ClickResetButton();
EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
EXPECT_EQ(0, session_manager_client_->start_device_wipe_call_count());
EXPECT_EQ(1, update_engine_client_->rollback_call_count());
- JSExpect("$('reset').classList.contains('revert-promise')");
+ JSExpect("$('reset').classList.contains('revert-promise-view')");
UpdateEngineClient::Status error_update_status;
error_update_status.status = UpdateEngineClient::UPDATE_STATUS_ERROR;
update_engine_client_->NotifyObserversThatStatusChanged(
@@ -238,13 +236,15 @@ IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, ErrorOnRollbackRequested) {
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest,
PRE_SuccessOnRollbackRequested) {
PrefService* prefs = g_browser_process->local_state();
- prefs->SetBoolean(prefs::kRollbackRequested, true);
prefs->SetBoolean(prefs::kFactoryResetRequested, true);
RegisterSomeUser();
}
IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, SuccessOnRollbackRequested) {
+ update_engine_client_->set_can_rollback_check_result(true);
OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_RESET).Wait();
+ InvokeRollbackOption();
+ ClickToConfirmButton();
ClickResetButton();
EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
EXPECT_EQ(0, session_manager_client_->start_device_wipe_call_count());
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/chromeos/login/ui/webui_login_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698