| 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 })); | 96 })); |
| 97 | 97 |
| 98 // The test completes after the sync config is sent out. | 98 // The test completes after the sync config is sent out. |
| 99 this.mockHandler.expects(once()).SyncSetupConfigure(ANYTHING). | 99 this.mockHandler.expects(once()).SyncSetupConfigure(ANYTHING). |
| 100 will(callFunction(testDone)); | 100 will(callFunction(testDone)); |
| 101 | 101 |
| 102 // Click the "Sign in to Chrome..." button. | 102 // Click the "Sign in to Chrome..." button. |
| 103 this.startSyncing(); | 103 this.startSyncing(); |
| 104 }); | 104 }); |
| 105 | 105 |
| 106 // This test is flaky on Linux and Windows bots. See crbug.com/579666 and | 106 // This test is flaky on Linux, Windows and Mac bots. See crbug.com/579666, |
| 107 // crbug.com/638884 | 107 // crbug.com/638884 and crbug.com/718947. |
| 108 GEN('#if defined(OS_LINUX) || defined(OS_WIN)'); | 108 GEN('#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)'); |
| 109 GEN('#define MAYBE_RestoreSyncDataTypes DISABLED_RestoreSyncDataTypes'); | 109 GEN('#define MAYBE_RestoreSyncDataTypes DISABLED_RestoreSyncDataTypes'); |
| 110 GEN('#else'); | 110 GEN('#else'); |
| 111 GEN('#define MAYBE_RestoreSyncDataTypes RestoreSyncDataTypes'); | 111 GEN('#define MAYBE_RestoreSyncDataTypes RestoreSyncDataTypes'); |
| 112 GEN('#endif // defined(OS_LINUX) || defined(OS_WIN)'); | 112 GEN('#endif // defined(OS_LINUX) || defined(OS_WIN)'); |
| 113 // Test that switching to and from "Sync everything" saves and restores types. | 113 // Test that switching to and from "Sync everything" saves and restores types. |
| 114 TEST_F('SyncSetupWebUITestAsync', 'MAYBE_RestoreSyncDataTypes', function() { | 114 TEST_F('SyncSetupWebUITestAsync', 'MAYBE_RestoreSyncDataTypes', function() { |
| 115 this.mockHandler.expects(once()).SyncSetupStartSignIn( | 115 this.mockHandler.expects(once()).SyncSetupStartSignIn( |
| 116 [false] /* createSupervisedUser */).will(callFunction(function() { | 116 [false] /* createSupervisedUser */).will(callFunction(function() { |
| 117 SyncSetupOverlay.showSyncSetupPage('configure', {}); | 117 SyncSetupOverlay.showSyncSetupPage('configure', {}); |
| 118 | 118 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 130 cr.dispatchSimpleEvent($('sync-select-datatypes'), 'change', true); | 130 cr.dispatchSimpleEvent($('sync-select-datatypes'), 'change', true); |
| 131 assertFalse($('bookmarks-checkbox').checked); | 131 assertFalse($('bookmarks-checkbox').checked); |
| 132 | 132 |
| 133 testDone(); | 133 testDone(); |
| 134 })); | 134 })); |
| 135 | 135 |
| 136 this.startSyncing(); | 136 this.startSyncing(); |
| 137 }); | 137 }); |
| 138 | 138 |
| 139 GEN('#endif // OS_CHROMEOS'); | 139 GEN('#endif // OS_CHROMEOS'); |
| OLD | NEW |