| OLD | NEW |
| 1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2015 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/macros.h" | 5 #include "base/macros.h" |
| 6 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h" | 6 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h" |
| 7 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.
h" | 7 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.
h" |
| 8 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_
impl.h" | 8 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_
impl.h" |
| 9 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_
mock.h" | 9 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_
mock.h" |
| 10 #include "chrome/browser/chromeos/login/login_manager_test.h" | 10 #include "chrome/browser/chromeos/login/login_manager_test.h" |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 ExpectEnrollmentCredentials(); | 169 ExpectEnrollmentCredentials(); |
| 170 SubmitEnrollmentCredentials(); | 170 SubmitEnrollmentCredentials(); |
| 171 | 171 |
| 172 // We need to reset enrollment_screen->enrollment_helper_, otherwise we will | 172 // We need to reset enrollment_screen->enrollment_helper_, otherwise we will |
| 173 // get some errors on shutdown. | 173 // get some errors on shutdown. |
| 174 enrollment_screen()->enrollment_helper_.reset(); | 174 enrollment_screen()->enrollment_helper_.reset(); |
| 175 } | 175 } |
| 176 | 176 |
| 177 // Shows the enrollment screen and simulates an enrollment failure. Verifies | 177 // Shows the enrollment screen and simulates an enrollment failure. Verifies |
| 178 // that the error screen is displayed. | 178 // that the error screen is displayed. |
| 179 // TODO(crbug.com/690634): Disabled due to timeout flakiness. |
| 179 IN_PROC_BROWSER_TEST_F(EnterpriseEnrollmentTest, | 180 IN_PROC_BROWSER_TEST_F(EnterpriseEnrollmentTest, |
| 180 TestProperPageGetsLoadedOnEnrollmentFailure) { | 181 DISABLED_TestProperPageGetsLoadedOnEnrollmentFailure) { |
| 181 ShowEnrollmentScreen(); | 182 ShowEnrollmentScreen(); |
| 182 | 183 |
| 183 enrollment_screen()->OnEnrollmentError(policy::EnrollmentStatus::ForStatus( | 184 enrollment_screen()->OnEnrollmentError(policy::EnrollmentStatus::ForStatus( |
| 184 policy::EnrollmentStatus::REGISTRATION_FAILED)); | 185 policy::EnrollmentStatus::REGISTRATION_FAILED)); |
| 185 ExecutePendingJavaScript(); | 186 ExecutePendingJavaScript(); |
| 186 | 187 |
| 187 // Verify that the error page is displayed. | 188 // Verify that the error page is displayed. |
| 188 EXPECT_TRUE(IsStepDisplayed("error")); | 189 EXPECT_TRUE(IsStepDisplayed("error")); |
| 189 EXPECT_FALSE(IsStepDisplayed("success")); | 190 EXPECT_FALSE(IsStepDisplayed("success")); |
| 190 } | 191 } |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 EXPECT_FALSE(IsStepDisplayed("success")); | 223 EXPECT_FALSE(IsStepDisplayed("success")); |
| 223 EXPECT_FALSE(IsStepDisplayed("error")); | 224 EXPECT_FALSE(IsStepDisplayed("error")); |
| 224 | 225 |
| 225 SubmitAttributePromptUpdate(); | 226 SubmitAttributePromptUpdate(); |
| 226 | 227 |
| 227 // We have to remove the enrollment_helper before the dtor gets called. | 228 // We have to remove the enrollment_helper before the dtor gets called. |
| 228 enrollment_screen()->enrollment_helper_.reset(); | 229 enrollment_screen()->enrollment_helper_.reset(); |
| 229 } | 230 } |
| 230 | 231 |
| 231 } // namespace chromeos | 232 } // namespace chromeos |
| OLD | NEW |