Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7121)

Unified Diff: chrome/test/data/extensions/api_test/automation/tests/desktop/load_tabs.js

Issue 1040863002: Revert "Enable chrome.automation.getDesktop on all aura platforms." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/data/extensions/api_test/automation/tests/desktop/load_tabs.js
diff --git a/chrome/test/data/extensions/api_test/automation/tests/desktop/load_tabs.js b/chrome/test/data/extensions/api_test/automation/tests/desktop/load_tabs.js
index 90e1711b2ef0422bf505be8f7aa01e1f659b12bb..a2f61c97ec70cec9bc8774bb1d8c3e8888ec4c18 100644
--- a/chrome/test/data/extensions/api_test/automation/tests/desktop/load_tabs.js
+++ b/chrome/test/data/extensions/api_test/automation/tests/desktop/load_tabs.js
@@ -22,14 +22,28 @@ var allTests = [
function testLoadTabs() {
var webViews = getAllWebViews();
assertEq(2, webViews.length);
- var subroot = webViews[1].firstChild;
- assertEq(webViews[1], subroot.parent);
- assertEq(subroot, subroot.parent.children[0]);
- var button = subroot.firstChild.firstChild;
- assertEq(chrome.automation.RoleType.button, button.role);
- var input = subroot.firstChild.lastChild.previousSibling;
- assertEq(chrome.automation.RoleType.textField, input.role);
- chrome.test.succeed();
+
+ // Test spins up more quickly than the load; listen for the childrenChanged
+ // event.
+ function childrenChangedListener(evt) {
+ var subroot = webViews[1].firstChild;
+ assertEq(evt.target, subroot.parent);
+ assertEq(subroot, subroot.parent.children[0]);
+
+ var button = subroot.firstChild.firstChild;
+ assertEq(chrome.automation.RoleType.button, button.role);
+
+ var input = subroot.firstChild.lastChild.previousSibling;
+ assertEq(chrome.automation.RoleType.textField, input.role);
+ webViews[1].removeEventListener(
+ chrome.automation.EventType.childrenChanged,
+ childrenChangedListener), true;
+ chrome.test.succeed();
+ }
+ webViews[1].addEventListener(
+ chrome.automation.EventType.childrenChanged,
+ childrenChangedListener,
+ true);
},
function testSubevents() {

Powered by Google App Engine
This is Rietveld 408576698