Tests for improved reset options reworked.

chrome/browser/chromeos/login/reset_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
@@ skipping 59 matching lines @@
 
   void InvokeResetScreen() {
     ASSERT_TRUE(JSExecuted("cr.ui.Oobe.handleAccelerator('reset');"));
     OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_RESET).Wait();
   }
 
   void InvokeRollbackOption() {
     ASSERT_TRUE(JSExecuted("cr.ui.Oobe.handleAccelerator('reset');"));
   }
 
+  void HideRollbackOption() {
+    ASSERT_TRUE(JSExecuted("cr.ui.Oobe.handleAccelerator('reset');"));
+  }
+
   void CloseResetScreen() {
     ASSERT_TRUE(JSExecuted("$('reset-cancel-button').click();"));
   }
 
   void ClickResetButton() {
     ASSERT_TRUE(JSExecuted("$('reset-confirm-commit').click();"));
   }
 
   void ClickRestartButton() {
     ASSERT_TRUE(JSExecuted("$('reset-restart-button').click();"));
   }
   void ClickToConfirmButton() {
     ASSERT_TRUE(JSExecuted("$('reset-toconfirm-button').click();"));
   }
+  void ClickDismissConfirmationButton() {
+    ASSERT_TRUE(JSExecuted("$('reset-confirm-dismiss').click();"));
+  }
 
   FakeUpdateEngineClient* update_engine_client_;
   FakeSessionManagerClient* session_manager_client_;
   FakePowerManagerClient* power_manager_client_;
 };
 
 class ResetFirstAfterBootTest : public ResetTest {
  public:
   virtual ~ResetFirstAfterBootTest() {}
 
@@ skipping 25 matching lines @@
   InvokeResetScreen();
   EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
   EXPECT_EQ(0, session_manager_client_->start_device_wipe_call_count());
   ClickRestartButton();
   ASSERT_EQ(1, power_manager_client_->num_request_restart_calls());
   ASSERT_EQ(0, session_manager_client_->start_device_wipe_call_count());
 
   EXPECT_TRUE(prefs->GetBoolean(prefs::kFactoryResetRequested));
 }
 
-IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, PRE_ShortcutInvokedCases) {
+IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, PRE_ViewsLogic) {
+  PrefService* prefs = g_browser_process->local_state();
+  prefs->SetBoolean(prefs::kFactoryResetRequested, true);
+  RegisterSomeUser();
+  update_engine_client_->set_can_rollback_check_result(false);
+}
+
+IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, ViewsLogic) {
+  PrefService* prefs = g_browser_process->local_state();
+
+  // Rollback unavailable. Show and cancel.
+  update_engine_client_->set_can_rollback_check_result(false);
+  JSExpect("document.querySelector('#reset').hidden");
+  JSExpect("document.querySelector('#overlay-reset').hidden");
+  InvokeResetScreen();
+  JSExpect("!document.querySelector('#reset').hidden");
+  JSExpect("document.querySelector('#overlay-reset').hidden");
+  CloseResetScreen();
+  JSExpect("document.querySelector('#reset').hidden");
+
+  // Go to confirmation phase, cancel from there in 2 steps.
+  prefs->SetBoolean(prefs::kFactoryResetRequested, true);
+  InvokeResetScreen();
+  JSExpect("document.querySelector('#overlay-reset').hidden");
+  ClickToConfirmButton();
+  JSExpect("!document.querySelector('#overlay-reset').hidden");
+  ClickDismissConfirmationButton();
+  JSExpect("document.querySelector('#overlay-reset').hidden");
+  JSExpect("!document.querySelector('#reset').hidden");
+  CloseResetScreen();
+  JSExpect("document.querySelector('#reset').hidden");
+
+  // Rollback available. Show and cancel from confirmation screen.
+  update_engine_client_->set_can_rollback_check_result(true);
+  prefs->SetBoolean(prefs::kFactoryResetRequested, true);
+  InvokeResetScreen();
+  InvokeRollbackOption();
+  JSExpect("document.querySelector('#overlay-reset').hidden");
+  ClickToConfirmButton();
+  JSExpect("!document.querySelector('#overlay-reset').hidden");
+  ClickDismissConfirmationButton();
+  JSExpect("document.querySelector('#overlay-reset').hidden");
+  JSExpect("!document.querySelector('#reset').hidden");
+  CloseResetScreen();
+  JSExpect("document.querySelector('#reset').hidden");
+}
+
+IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, PRE_ShowAfterBootIfRequested) {
   PrefService* prefs = g_browser_process->local_state();
   prefs->SetBoolean(prefs::kFactoryResetRequested, true);
   RegisterSomeUser();
 }
 
-IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, ShortcutInvokedCases) {
-  // rollback unavailable
+IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, ShowAfterBootIfRequested) {
+  OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_RESET).Wait();
+  JSExpect("!document.querySelector('#reset').hidden");
+  CloseResetScreen();
+  JSExpect("document.querySelector('#reset').hidden");
+}
+
+
+IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, PRE_RollbackUnavailable) {
+  PrefService* prefs = g_browser_process->local_state();
+  prefs->SetBoolean(prefs::kFactoryResetRequested, true);
+  RegisterSomeUser();
+}
+
+IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, RollbackUnavailable) {
   update_engine_client_->set_can_rollback_check_result(false);
+
   InvokeResetScreen();
   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();
+  InvokeRollbackOption();  // No changes
   ClickToConfirmButton();
   ClickResetButton();
   EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
   EXPECT_EQ(1, session_manager_client_->start_device_wipe_call_count());
   EXPECT_EQ(0, update_engine_client_->rollback_call_count());
   CloseResetScreen();
   OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait();
 
+  // Next invocation leads to rollback view.
   PrefService* prefs = g_browser_process->local_state();
   prefs->SetBoolean(prefs::kFactoryResetRequested, true);
+  InvokeResetScreen();
+  ClickToConfirmButton();
+  ClickResetButton();
+  EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
+  EXPECT_EQ(2, session_manager_client_->start_device_wipe_call_count());
+  EXPECT_EQ(0, update_engine_client_->rollback_call_count());
+  CloseResetScreen();
+}
+
+IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, PRE_RollbackAvailable) {
+  PrefService* prefs = g_browser_process->local_state();
+  prefs->SetBoolean(prefs::kFactoryResetRequested, true);
+  RegisterSomeUser();
+}
+
+IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, RollbackAvailable) {
   update_engine_client_->set_can_rollback_check_result(true);
-  // rollback available and unchecked
+  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());
+  EXPECT_EQ(0, update_engine_client_->rollback_call_count());
+  ClickToConfirmButton();
+  ClickResetButton();
+  EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
+  EXPECT_EQ(1, session_manager_client_->start_device_wipe_call_count());
+  EXPECT_EQ(0, update_engine_client_->rollback_call_count());
+  CloseResetScreen();
+  OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait();
+
+  // Next invocation leads to simple reset, not rollback view.
+  prefs->SetBoolean(prefs::kFactoryResetRequested, true);
+  InvokeResetScreen();
+  InvokeRollbackOption();  // Shows rollback.
+  ClickDismissConfirmationButton();
+  CloseResetScreen();
   InvokeResetScreen();
   ClickToConfirmButton();
   ClickResetButton();
   EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
   EXPECT_EQ(2, session_manager_client_->start_device_wipe_call_count());
   EXPECT_EQ(0, update_engine_client_->rollback_call_count());
   CloseResetScreen();
   OobeScreenWaiter(OobeDisplay::SCREEN_ACCOUNT_PICKER).Wait();
 
   prefs->SetBoolean(prefs::kFactoryResetRequested, true);
-  // rollback available and checked
   InvokeResetScreen();
-  InvokeRollbackOption();
+  InvokeRollbackOption();  // Shows rollback.
   ClickToConfirmButton();
   ClickResetButton();
   EXPECT_EQ(0, power_manager_client_->num_request_restart_calls());
   EXPECT_EQ(2, session_manager_client_->start_device_wipe_call_count());
   EXPECT_EQ(1, update_engine_client_->rollback_call_count());
 }
 
-IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, PRE_PowerwashRequested) {
-  PrefService* prefs = g_browser_process->local_state();
-  prefs->SetBoolean(prefs::kFactoryResetRequested, true);
-  RegisterSomeUser();
-}
-
-IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, PowerwashRequested) {
-  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());
-  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());
-  EXPECT_EQ(0, update_engine_client_->rollback_call_count());
-}
-
 IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest, PRE_ErrorOnRollbackRequested) {
   PrefService* prefs = g_browser_process->local_state();
   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-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-view')");
   UpdateEngineClient::Status error_update_status;
   error_update_status.status = UpdateEngineClient::UPDATE_STATUS_ERROR;
   update_engine_client_->NotifyObserversThatStatusChanged(
       error_update_status);
   OobeScreenWaiter(OobeDisplay::SCREEN_ERROR_MESSAGE).Wait();
 }
 
-IN_PROC_BROWSER_TEST_F(ResetFirstAfterBootTest,
-                       PRE_SuccessOnRollbackRequested) {
-  PrefService* prefs = g_browser_process->local_state();
-  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();
-  LOG(ERROR) << "1";
-  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());
-  UpdateEngineClient::Status ready_for_reboot_status;
-  ready_for_reboot_status.status =
-      UpdateEngineClient::UPDATE_STATUS_UPDATED_NEED_REBOOT;
-  update_engine_client_->NotifyObserversThatStatusChanged(
-      ready_for_reboot_status);
-  EXPECT_EQ(1, power_manager_client_->num_request_restart_calls());
-}
-
-
 }  // namespace chromeos