Merge "Fix Safari test"

This commit is contained in:
Andrew Bonventre
2016-11-21 17:42:21 +00:00
committed by Gerrit Code Review

View File

@@ -128,6 +128,8 @@ limitations under the License.
// Async tick is needed because iron-selector content is distributed and // Async tick is needed because iron-selector content is distributed and
// distributed content requires an observer to be set up. // distributed content requires an observer to be set up.
// Note: Double flush seems to be needed in Safari. {@see Issue 4963}.
flush(function() {
flush(function() { flush(function() {
for (var label in element.permittedLabels) { for (var label in element.permittedLabels) {
assert.ok(element.$$('iron-selector[data-label="' + label + '"]'), assert.ok(element.$$('iron-selector[data-label="' + label + '"]'),
@@ -171,6 +173,7 @@ limitations under the License.
}); });
}); });
}); });
});
function getActiveElement() { function getActiveElement() {
return Polymer.IronOverlayManager.deepActiveElement; return Polymer.IronOverlayManager.deepActiveElement;