| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 GEN('#if !defined(OS_CHROMEOS)'); | 5 GEN('#if !defined(OS_CHROMEOS)'); |
| 6 | 6 |
| 7 /** | 7 /** |
| 8 * Test fixture for sync setup WebUI testing. | 8 * Test fixture for sync setup WebUI testing. |
| 9 * @constructor | 9 * @constructor |
| 10 * @extends {testing.Test} | 10 * @extends {testing.Test} |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 this.verifyUnsynced(); | 74 this.verifyUnsynced(); |
| 75 | 75 |
| 76 // Handle SyncSetupShowSetupUI by navigating to chrome://settings/syncSetup. | 76 // Handle SyncSetupShowSetupUI by navigating to chrome://settings/syncSetup. |
| 77 this.mockHandler.expects(once()).SyncSetupShowSetupUI().will(callFunction( | 77 this.mockHandler.expects(once()).SyncSetupShowSetupUI().will(callFunction( |
| 78 function() { | 78 function() { |
| 79 PageManager.showPageByName('syncSetup'); | 79 PageManager.showPageByName('syncSetup'); |
| 80 })); | 80 })); |
| 81 }, | 81 }, |
| 82 }; | 82 }; |
| 83 | 83 |
| 84 // This test is flaky on Linux bot (crbug.com/579666) and Windows bot | 84 // This test is flaky on Linux bot (crbug.com/579666) and Windows & Mac bots |
| 85 // (crbug.com/608975). | 85 // (crbug.com/608975). |
| 86 GEN('#if defined(OS_LINUX) || defined(OS_WIN)'); | 86 TEST_F('SyncSetupWebUITestAsync', 'DISABLED_VerifySignIn', function() { |
| 87 GEN('#define MAYBE_VerifySignIn DISABLED_VerifySignIn'); | |
| 88 GEN('#else'); | |
| 89 GEN('#define MAYBE_VerifySignIn VerifySignIn'); | |
| 90 GEN('#endif // defined(OS_LINUX) || defined(OS_WIN)'); | |
| 91 TEST_F('SyncSetupWebUITestAsync', 'MAYBE_VerifySignIn', function() { | |
| 92 // Handle SyncSetupStartSignIn by displaying the sync setup dialog, verifying | 87 // Handle SyncSetupStartSignIn by displaying the sync setup dialog, verifying |
| 93 // that a confirmation dialog appears, and clicking OK to dismiss the dialog. | 88 // that a confirmation dialog appears, and clicking OK to dismiss the dialog. |
| 94 // Note that this test doesn't actually do a gaia sign in. | 89 // Note that this test doesn't actually do a gaia sign in. |
| 95 this.mockHandler.expects(once()).SyncSetupStartSignIn( | 90 this.mockHandler.expects(once()).SyncSetupStartSignIn( |
| 96 [false] /* createSupervisedUser */).will(callFunction(function() { | 91 [false] /* createSupervisedUser */).will(callFunction(function() { |
| 97 SyncSetupOverlay.showSyncSetupPage('configure'); | 92 SyncSetupOverlay.showSyncSetupPage('configure'); |
| 98 var okButton = $('confirm-everything-ok'); | 93 var okButton = $('confirm-everything-ok'); |
| 99 assertNotEquals(null, okButton); | 94 assertNotEquals(null, okButton); |
| 100 okButton.click(); | 95 okButton.click(); |
| 101 })); | 96 })); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 cr.dispatchSimpleEvent($('sync-select-datatypes'), 'change', true); | 130 cr.dispatchSimpleEvent($('sync-select-datatypes'), 'change', true); |
| 136 assertFalse($('bookmarks-checkbox').checked); | 131 assertFalse($('bookmarks-checkbox').checked); |
| 137 | 132 |
| 138 testDone(); | 133 testDone(); |
| 139 })); | 134 })); |
| 140 | 135 |
| 141 this.startSyncing(); | 136 this.startSyncing(); |
| 142 }); | 137 }); |
| 143 | 138 |
| 144 GEN('#endif // OS_CHROMEOS'); | 139 GEN('#endif // OS_CHROMEOS'); |
| OLD | NEW |