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

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

Issue 10096012: [cros] Add Ctrl+Alt+E shortcut to Welcome/EULA screen that cancels update and starts with enrollment (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add test Created 8 years, 8 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
Index: chrome/browser/chromeos/login/wizard_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index 65c1d80a9117150022008a7a164f50335800e57d..daffe550cede525b8580a0f01bd3337a8dc875cf 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -6,6 +6,8 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_shutdown.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/chromeos/login/base_login_display_host.h"
#include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.h"
#include "chrome/browser/chromeos/login/enrollment/mock_enterprise_enrollment_screen.h"
@@ -110,6 +112,9 @@ class WizardControllerFlowTest : public WizardControllerTest {
// Make sure that OOBE is run as an "official" build.
WizardController::default_controller()->is_official_build_ = true;
+ // Clear portal list (as it is by default in OOBE).
+ CrosLibrary::Get()->GetNetworkLibrary()->SetCheckPortalList("");
+
// Set up the mocks for all screens.
MOCK(mock_network_screen_, network_screen_,
MockNetworkScreen, MockNetworkScreenActor);
@@ -167,6 +172,8 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowMain) {
OnExit(ScreenObserver::UPDATE_INSTALLED);
EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
+ EXPECT_EQ("ethernet,wifi,cellular",
+ CrosLibrary::Get()->GetNetworkLibrary()->GetCheckPortalList());
}
IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorUpdate) {
@@ -197,6 +204,33 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorUpdate) {
EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
}
+IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowSkipUpdateEnroll) {
+ EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
+ WizardController::default_controller()->current_screen());
+ EXPECT_CALL(*mock_update_screen_, StartUpdate()).Times(0);
+ EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
+ EXPECT_CALL(*mock_update_screen_, Show()).Times(0);
+ EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
+ OnExit(ScreenObserver::NETWORK_CONNECTED);
+
+ EXPECT_EQ(WizardController::default_controller()->GetEulaScreen(),
+ WizardController::default_controller()->current_screen());
+ EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
+ EXPECT_CALL(*mock_update_screen_, StartUpdate()).Times(0);
+ EXPECT_CALL(*mock_update_screen_, Show()).Times(0);
+ WizardController::default_controller()->SkipUpdateEnrollAfterEula();
+ EXPECT_CALL(*mock_enterprise_enrollment_screen_, Show()).Times(1);
+ EXPECT_CALL(*mock_enterprise_enrollment_screen_, Hide()).Times(0);
+ OnExit(ScreenObserver::EULA_ACCEPTED);
+
+ EXPECT_EQ(WizardController::default_controller()->
+ GetEnterpriseEnrollmentScreen(),
+ WizardController::default_controller()->current_screen());
+ EXPECT_TRUE(ExistingUserController::current_controller() == NULL);
+ EXPECT_EQ("ethernet,wifi,cellular",
+ CrosLibrary::Get()->GetNetworkLibrary()->GetCheckPortalList());
+}
+
IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowEulaDeclined) {
EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
WizardController::default_controller()->current_screen());
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/browser/resources/chromeos/login/display_manager.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698