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 /** | 5 /** |
6 * TestFixture for browser options WebUI testing. | 6 * TestFixture for browser options WebUI testing. |
7 * @extends {testing.Test} | 7 * @extends {testing.Test} |
8 * @constructor | 8 * @constructor |
9 */ | 9 */ |
10 function BrowserOptionsWebUITest() {} | 10 function BrowserOptionsWebUITest() {} |
(...skipping 23 matching lines...) Expand all Loading... | |
34 * @extends {testing.Test} | 34 * @extends {testing.Test} |
35 * @constructor | 35 * @constructor |
36 */ | 36 */ |
37 function BrowserOptionsOverlayWebUITest() {} | 37 function BrowserOptionsOverlayWebUITest() {} |
38 | 38 |
39 BrowserOptionsOverlayWebUITest.prototype = { | 39 BrowserOptionsOverlayWebUITest.prototype = { |
40 __proto__: testing.Test.prototype, | 40 __proto__: testing.Test.prototype, |
41 | 41 |
42 /** @override */ | 42 /** @override */ |
43 browsePreload: 'chrome://chrome/settings/autofill', | 43 browsePreload: 'chrome://chrome/settings/autofill', |
44 | |
45 /** @override */ | |
46 isAsync: true, | |
44 }; | 47 }; |
45 | 48 |
46 TEST_F('BrowserOptionsOverlayWebUITest', 'testNavigationInBackground', | 49 TEST_F('BrowserOptionsOverlayWebUITest', 'testNavigationInBackground', |
47 function() { | 50 function() { |
48 assertEquals(this.browsePreload, document.location.href); | 51 assertEquals(this.browsePreload, document.location.href); |
49 expectTrue($('navigation').classList.contains('background')); | 52 |
53 // Speculative fix for 403627. | |
Evan Stade
2014/08/14 17:10:02
this comment should read: wait for the message to
michaelpg
2014/08/14 23:02:52
Done.
| |
54 if (!$('navigation').classList.contains('background')) { | |
Evan Stade
2014/08/14 17:10:02
nit:
if ($('navigation').classList.contains('back
michaelpg
2014/08/14 23:02:52
Done.
| |
55 window.addEventListener('message', function(e) { | |
56 if (e.data.method == 'beginInterceptingEvents') { | |
57 window.setTimeout(function() { | |
58 assertTrue($('navigation').classList.contains('background')); | |
59 testDone(); | |
60 }); | |
61 } | |
62 }); | |
63 } else { | |
64 testDone(); | |
65 } | |
50 }); | 66 }); |
51 | 67 |
52 /** | 68 /** |
53 * @extends {testing.Test} | 69 * @extends {testing.Test} |
54 * @constructor | 70 * @constructor |
55 */ | 71 */ |
56 function BrowserOptionsFrameWebUITest() {} | 72 function BrowserOptionsFrameWebUITest() {} |
57 | 73 |
58 BrowserOptionsFrameWebUITest.prototype = { | 74 BrowserOptionsFrameWebUITest.prototype = { |
59 __proto__: testing.Test.prototype, | 75 __proto__: testing.Test.prototype, |
(...skipping 18 matching lines...) Expand all Loading... | |
78 __proto__: testing.Test.prototype, | 94 __proto__: testing.Test.prototype, |
79 | 95 |
80 /** @override */ | 96 /** @override */ |
81 browsePreload: 'chrome://settings-frame/autofill', | 97 browsePreload: 'chrome://settings-frame/autofill', |
82 }; | 98 }; |
83 | 99 |
84 TEST_F('AdvancedSettingsWebUITest', 'testAdvancedSettingsShown', function() { | 100 TEST_F('AdvancedSettingsWebUITest', 'testAdvancedSettingsShown', function() { |
85 assertEquals(this.browsePreload, document.location.href); | 101 assertEquals(this.browsePreload, document.location.href); |
86 expectFalse($('advanced-settings').hidden); | 102 expectFalse($('advanced-settings').hidden); |
87 }); | 103 }); |
OLD | NEW |