PolymerTestBase: Load mock-interactions.js instead of importing HTML

chrome/test/data/webui/polymer_browser_test_base.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview Framework for running JavaScript tests of Polymer elements.
  */
 
 /**
  * Test fixture for Polymer element testing.
@@ skipping 42 matching lines @@
     this.preloadTime = window.performance.now();
     testing.Test.prototype.preLoad.call(this);
   },
 
   /** @override */
   setUp: function() {
     testing.Test.prototype.setUp.call(this);
 
     // List of imported URLs for debugging purposes.
     PolymerTest.importUrls_ = [];
+    PolymerTest.scriptUrls_ = [];
 
     // Importing a URL like "chrome://md-settings/foo" redirects to the base
     // ("chrome://md-settings") page, which due to how browsePreload works can
     // result in duplicate imports. Wrap document.registerElement so failures
     // caused by re-registering Polymer elements are caught; otherwise Chrome
     // simply throws "Script error" which is unhelpful.
     var originalRegisterElement = document.registerElement;
     document.registerElement = function() {
       try {
         return originalRegisterElement.apply(document, arguments);
       } catch (e) {
         var msg =
             'If the call to document.registerElement failed because a type ' +
             'is already registered, perhaps you have loaded a script twice. ' +
             'Incorrect resource URLs can redirect to base WebUI pages; make ' +
             'sure the following URLs are correct and unique:\n';
         for (var i = 0; i < PolymerTest.importUrls_.length; i++)
           msg += '  ' + PolymerTest.importUrls_[i] + '\n';
+        for (var i = 0; i < PolymerTest.scriptUrls_.length; i++)
+          msg += '  ' + PolymerTest.scriptUrls_[i] + '\n';
         console.error(msg);
 
         // Mocha will handle the error.
         throw e;
       }
     };
 
     // Import Polymer and iron-test-helpers before running tests.
     suiteSetup(function() {
       var promises = [];
       if (typeof Polymer != 'function') {
         promises.push(
             PolymerTest.importHtml(
                 'chrome://resources/polymer/v1_0/polymer/polymer.html'));
       }
-      if (typeof TestHelpers != 'object') {
+      if (typeof MockInteractions != 'object') {
+        // Avoid importing the HTML file because iron-test-helpers assumes it is
+        // not being imported separately alongside a vulcanized Polymer.
         promises.push(
-            PolymerTest.importHtml(
+            PolymerTest.loadScript(
                 'chrome://resources/polymer/v1_0/iron-test-helpers/' +
-                'iron-test-helpers.html'));
+                'mock-interactions.js'));
       }
       return Promise.all(promises);
     });
   },
 
   /** @override */
   runTest: function(testBody) {
     this.runTime = window.performance.now();
     testing.Test.prototype.runTest.call(this, testBody);
   },
@@ skipping 23 matching lines @@
   var promise = new Promise(function(resolve, reject) {
     link.onload = resolve;
     link.onerror = reject;
   });
   link.href = src;
   document.head.appendChild(link);
   return promise;
 };
 
 /**
+ * Loads the script file.
+ * @param {string} src The URL to load.
+ * @return {Promise} A promise that is resolved/rejected on success/failure.

[Dan Beam, 2016/01/12 20:12:59]

nit: !Promise

[michaelpg, 2016/01/12 20:16:16]

Done.

+ */
+PolymerTest.loadScript = function(src) {
+  PolymerTest.scriptUrls_.push(src);
+  var script = document.createElement('script');
+  var promise = new Promise(function(resolve, reject) {
+    script.onload = resolve;
+    script.onerror = reject;
+  });
+  script.src = src;
+  document.head.appendChild(script);
+  return promise;
+};
+
+/**
  * Removes all content from the body.
  */
 PolymerTest.clearBody = function() {
   document.body.innerHTML = '';
 };
 
 /**
  * Helper function to return the list of extra libraries relative to basePath.
  */
 PolymerTest.getLibraries = function(basePath) {
   // Ensure basePath ends in '/'.
   if (basePath.length && basePath[basePath.length - 1] != '/')
     basePath += '/';
 
   return PolymerTest.prototype.extraLibraries.map(function(library) {
     return basePath + library;
   });
 };