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

Side by Side Diff: chrome/browser/chromeos/login/login_ui_browsertest.cc

Issue 131463005: kiosk: Show network screen for interrupted enrollment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/login/login_display_host_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/prefs/pref_service.h" 5 #include "base/prefs/pref_service.h"
6 #include "chrome/browser/browser_process.h" 6 #include "chrome/browser/browser_process.h"
7 #include "chrome/browser/chromeos/login/login_manager_test.h" 7 #include "chrome/browser/chromeos/login/login_manager_test.h"
8 #include "chrome/browser/chromeos/login/startup_utils.h" 8 #include "chrome/browser/chromeos/login/startup_utils.h"
9 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h" 9 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
(...skipping 25 matching lines...) Expand all
36 JSExpect("!!document.querySelector('#pod-row')"); 36 JSExpect("!!document.querySelector('#pod-row')");
37 JSExpect( 37 JSExpect(
38 "document.querySelectorAll('.pod:not(#user-pod-template)').length == 2"); 38 "document.querySelectorAll('.pod:not(#user-pod-template)').length == 2");
39 39
40 JSExpect("document.querySelectorAll('.pod:not(#user-pod-template)')[0]" 40 JSExpect("document.querySelectorAll('.pod:not(#user-pod-template)')[0]"
41 ".user.emailAddress == '" + std::string(kTestUser1) + "'"); 41 ".user.emailAddress == '" + std::string(kTestUser1) + "'");
42 JSExpect("document.querySelectorAll('.pod:not(#user-pod-template)')[1]" 42 JSExpect("document.querySelectorAll('.pod:not(#user-pod-template)')[1]"
43 ".user.emailAddress == '" + std::string(kTestUser2) + "'"); 43 ".user.emailAddress == '" + std::string(kTestUser2) + "'");
44 } 44 }
45 45
46 IN_PROC_BROWSER_TEST_F(LoginUITest, PRE_ShowEnrollmentFirst) { 46 IN_PROC_BROWSER_TEST_F(LoginUITest, PRE_InterruptedAutoStartEnrollment) {
47 StartupUtils::MarkOobeCompleted(); 47 StartupUtils::MarkOobeCompleted();
48 48
49 PrefService* prefs = g_browser_process->local_state(); 49 PrefService* prefs = g_browser_process->local_state();
50 prefs->SetBoolean(prefs::kDeviceEnrollmentAutoStart, true); 50 prefs->SetBoolean(prefs::kDeviceEnrollmentAutoStart, true);
51 } 51 }
52 52
53 // Tests that the default first screen is the enrollment screen after OOBE 53 // Tests that the default first screen is the network screen after OOBE
54 // when auto enrollment is enabled and device is not yet enrolled. 54 // when auto enrollment is enabled and device is not yet enrolled.
55 IN_PROC_BROWSER_TEST_F(LoginUITest, ShowEnrollmentFirst) { 55 IN_PROC_BROWSER_TEST_F(LoginUITest, InterruptedAutoStartEnrollment) {
56 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_ENROLLMENT).Wait(); 56 OobeScreenWaiter(OobeDisplay::SCREEN_OOBE_NETWORK).Wait();
57 } 57 }
58 58
59 } // namespace chromeos 59 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_display_host_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698