Bug 1245153 - Rename interactions.js to interaction.js; r=automatedtester
MozReview-Commit-ID: F51ENbkcoR2
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -20,17 +20,17 @@ Cu.import("resource://gre/modules/XPCOMU
var {devtools} = Cu.import("resource://devtools/shared/Loader.jsm", {});
this.DevToolsUtils = devtools.require("devtools/shared/DevToolsUtils");
XPCOMUtils.defineLazyServiceGetter(
this, "cookieManager", "@mozilla.org/cookiemanager;1", "nsICookieManager2");
Cu.import("chrome://marionette/content/actions.js");
Cu.import("chrome://marionette/content/atom.js");
-Cu.import("chrome://marionette/content/interactions.js");
+Cu.import("chrome://marionette/content/interaction.js");
Cu.import("chrome://marionette/content/element.js");
Cu.import("chrome://marionette/content/event.js");
Cu.import("chrome://marionette/content/frame-manager.js");
Cu.import("chrome://marionette/content/error.js");
Cu.import("chrome://marionette/content/modal.js");
Cu.import("chrome://marionette/content/proxy.js");
Cu.import("chrome://marionette/content/simpletest.js");
rename from testing/marionette/interactions.js
rename to testing/marionette/interaction.js
--- a/testing/marionette/jar.mn
+++ b/testing/marionette/jar.mn
@@ -2,17 +2,17 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
marionette.jar:
% content marionette %content/
content/server.js (server.js)
content/driver.js (driver.js)
content/actions.js (actions.js)
- content/interactions.js (interactions.js)
+ content/interaction.js (interaction.js)
content/accessibility.js (accessibility.js)
content/listener.js (listener.js)
content/element.js (element.js)
content/common.js (common.js)
content/simpletest.js (simpletest.js)
content/frame-manager.js (frame-manager.js)
content/event.js (event.js)
content/ChromeUtils.js (ChromeUtils.js)
--- a/testing/marionette/listener.js
+++ b/testing/marionette/listener.js
@@ -16,17 +16,17 @@ loader.loadSubScript("chrome://marionett
Cu.import("chrome://marionette/content/actions.js");
Cu.import("chrome://marionette/content/atom.js");
Cu.import("chrome://marionette/content/capture.js");
Cu.import("chrome://marionette/content/cookies.js");
Cu.import("chrome://marionette/content/element.js");
Cu.import("chrome://marionette/content/error.js");
Cu.import("chrome://marionette/content/event.js");
Cu.import("chrome://marionette/content/proxy.js");
-Cu.import("chrome://marionette/content/interactions.js");
+Cu.import("chrome://marionette/content/interaction.js");
Cu.import("resource://gre/modules/FileUtils.jsm");
Cu.import("resource://gre/modules/NetUtil.jsm");
Cu.import("resource://gre/modules/Task.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
var marionetteLogObj = new MarionetteLogObj();