From 12e70460dcd360dd2771a09c8256e8c6757f50ed Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 8 May 2017 18:45:57 -0400 Subject: [PATCH] Load polyfill in tests for Object.values() support in Fx45 --- test/content/runtests.js | 2 ++ test/content/support.js | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/test/content/runtests.js b/test/content/runtests.js index 49a17fd75f..4c7b6b05cb 100644 --- a/test/content/runtests.js +++ b/test/content/runtests.js @@ -1,3 +1,5 @@ +Components.utils.import("resource://gre/modules/Services.jsm"); +Services.scriptloader.loadSubScript("resource://zotero/polyfill.js"); Components.utils.import("resource://gre/modules/osfile.jsm"); var EventUtils = Components.utils.import("resource://zotero-unit/EventUtils.jsm"); diff --git a/test/content/support.js b/test/content/support.js index 547edb99a0..d3f38d5711 100644 --- a/test/content/support.js +++ b/test/content/support.js @@ -81,7 +81,6 @@ var loadPrefPane = Zotero.Promise.coroutine(function* (paneName) { */ function waitForWindow(uri, callback) { var deferred = Zotero.Promise.defer(); - Components.utils.import("resource://gre/modules/Services.jsm"); var loadobserver = function(ev) { ev.originalTarget.removeEventListener("load", loadobserver, false); Zotero.debug("Window opened: " + ev.target.location.href); @@ -245,7 +244,6 @@ function waitForNotifierEvent(event, type) { * Looks for windows with a specific URL. */ function getWindows(uri) { - Components.utils.import("resource://gre/modules/Services.jsm"); var enumerator = Services.wm.getEnumerator(null); var wins = []; while(enumerator.hasMoreElements()) { @@ -499,7 +497,6 @@ function uninstallPDFTools() { * (i.e., test/tests/data) */ function getTestDataDirectory() { - Components.utils.import("resource://gre/modules/Services.jsm"); var resource = Services.io.getProtocolHandler("resource"). QueryInterface(Components.interfaces.nsIResProtocolHandler), resURI = Services.io.newURI("resource://zotero-unit-tests/data", null, null);