| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <cstring> | 5 #include <cstring> |
| 6 #include <memory> | 6 #include <memory> |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 466 std::string message; | 466 std::string message; |
| 467 do { | 467 do { |
| 468 ASSERT_TRUE(message_queue.WaitForMessage(&message)); | 468 ASSERT_TRUE(message_queue.WaitForMessage(&message)); |
| 469 } while (message != "\"GaiaLoaded\""); | 469 } while (message != "\"GaiaLoaded\""); |
| 470 | 470 |
| 471 // Saml flow is gone. | 471 // Saml flow is gone. |
| 472 JsExpect("!$('gaia-signin').classList.contains('full-width')"); | 472 JsExpect("!$('gaia-signin').classList.contains('full-width')"); |
| 473 } | 473 } |
| 474 | 474 |
| 475 // Tests the sign-in flow when the credentials passing API is used. | 475 // Tests the sign-in flow when the credentials passing API is used. |
| 476 IN_PROC_BROWSER_TEST_F(SamlTest, CredentialPassingAPI) { | 476 // |
| 477 // Flaky. See http://crbug.com/659992 |
| 478 #if defined(OS_LINUX) |
| 479 #define MAYBE_CredentialPassingAPI DISABLED_CredentialPassingAPI |
| 480 #else |
| 481 #define MAYBE_CredentialPassingAPI CredentialPassingAPI |
| 482 #endif |
| 483 IN_PROC_BROWSER_TEST_F(SamlTest, MAYBE_CredentialPassingAPI) { |
| 477 fake_saml_idp()->SetLoginHTMLTemplate("saml_api_login.html"); | 484 fake_saml_idp()->SetLoginHTMLTemplate("saml_api_login.html"); |
| 478 fake_saml_idp()->SetLoginAuthHTMLTemplate("saml_api_login_auth.html"); | 485 fake_saml_idp()->SetLoginAuthHTMLTemplate("saml_api_login_auth.html"); |
| 479 StartSamlAndWaitForIdpPageLoad(kFirstSAMLUserEmail); | 486 StartSamlAndWaitForIdpPageLoad(kFirstSAMLUserEmail); |
| 480 | 487 |
| 481 content::WindowedNotificationObserver session_start_waiter( | 488 content::WindowedNotificationObserver session_start_waiter( |
| 482 chrome::NOTIFICATION_SESSION_STARTED, | 489 chrome::NOTIFICATION_SESSION_STARTED, |
| 483 content::NotificationService::AllSources()); | 490 content::NotificationService::AllSources()); |
| 484 | 491 |
| 485 // Fill-in the SAML IdP form and submit. | 492 // Fill-in the SAML IdP form and submit. |
| 486 SetSignFormField("Email", "fake_user"); | 493 SetSignFormField("Email", "fake_user"); |
| (...skipping 903 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1390 | 1397 |
| 1391 // Scraping one password should finish login. | 1398 // Scraping one password should finish login. |
| 1392 content::WindowedNotificationObserver session_start_waiter( | 1399 content::WindowedNotificationObserver session_start_waiter( |
| 1393 chrome::NOTIFICATION_SESSION_STARTED, | 1400 chrome::NOTIFICATION_SESSION_STARTED, |
| 1394 content::NotificationService::AllSources()); | 1401 content::NotificationService::AllSources()); |
| 1395 ExecuteJsInSigninFrame("document.getElementById('Submit').click();"); | 1402 ExecuteJsInSigninFrame("document.getElementById('Submit').click();"); |
| 1396 session_start_waiter.Wait(); | 1403 session_start_waiter.Wait(); |
| 1397 } | 1404 } |
| 1398 | 1405 |
| 1399 } // namespace chromeos | 1406 } // namespace chromeos |
| OLD | NEW |