From d2686ad2895c25d4119087ebc18fa64114b2a6e5 Mon Sep 17 00:00:00 2001 From: Geoff Lankow Date: Fri, 5 Aug 2011 23:55:49 +1200 Subject: [PATCH] Bug 668710 - Move mockObjects.js in with the rest of SimpleTest; r=dao --HG-- rename : toolkit/content/tests/browser/common/mockObjects.js => testing/mochitest/tests/SimpleTest/MockObjects.js --- dom/tests/mochitest/bugs/test_bug61098.html | 2 +- testing/mochitest/jar.mn | 4 ++-- testing/mochitest/tests/SimpleTest/Makefile.in | 4 ++-- .../mochitest/tests/SimpleTest/MockObjects.js | 0 toolkit/content/tests/browser/common/Makefile.in | 1 - toolkit/content/tests/browser/common/mockTransfer.js | 3 +-- 6 files changed, 6 insertions(+), 8 deletions(-) rename toolkit/content/tests/browser/common/mockObjects.js => testing/mochitest/tests/SimpleTest/MockObjects.js (100%) diff --git a/dom/tests/mochitest/bugs/test_bug61098.html b/dom/tests/mochitest/bugs/test_bug61098.html index b1c3952880c..50be34d2194 100644 --- a/dom/tests/mochitest/bugs/test_bug61098.html +++ b/dom/tests/mochitest/bugs/test_bug61098.html @@ -8,7 +8,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=61098 - + diff --git a/testing/mochitest/jar.mn b/testing/mochitest/jar.mn index fd2b0fd1d37..342f9637e5a 100644 --- a/testing/mochitest/jar.mn +++ b/testing/mochitest/jar.mn @@ -23,8 +23,8 @@ mochikit.jar: content/tests/SimpleTest/test.css (tests/SimpleTest/test.css) content/tests/SimpleTest/TestRunner.js (tests/SimpleTest/TestRunner.js) content/tests/SimpleTest/WindowSnapshot.js (tests/SimpleTest/WindowSnapshot.js) - content/tests/SimpleTest/mockObjects.js (../../toolkit/content/tests/browser/common/mockObjects.js) - content/tests/SimpleTest/docshell_helpers.js (../..//docshell/test/chrome/docshell_helpers.js) + content/tests/SimpleTest/MockObjects.js (tests/SimpleTest/MockObjects.js) + content/tests/SimpleTest/docshell_helpers.js (../../docshell/test/chrome/docshell_helpers.js) % resource mochikit %modules/ modules/MockFilePicker.jsm (MockFilePicker.jsm) diff --git a/testing/mochitest/tests/SimpleTest/Makefile.in b/testing/mochitest/tests/SimpleTest/Makefile.in index 87502e97b66..79557523c4d 100644 --- a/testing/mochitest/tests/SimpleTest/Makefile.in +++ b/testing/mochitest/tests/SimpleTest/Makefile.in @@ -53,8 +53,8 @@ _SIMPLETEST_FILES = MozillaLogger.js \ WindowSnapshot.js \ specialpowersAPI.js \ SpecialPowersObserverAPI.js \ - $(DEPTH)/toolkit/content/tests/browser/common/mockObjects.js \ - $(DEPTH)/docshell/test/chrome/docshell_helpers.js \ + MockObjects.js \ + $(DEPTH)/docshell/test/chrome/docshell_helpers.js \ $(NULL) libs:: $(_SIMPLETEST_FILES) diff --git a/toolkit/content/tests/browser/common/mockObjects.js b/testing/mochitest/tests/SimpleTest/MockObjects.js similarity index 100% rename from toolkit/content/tests/browser/common/mockObjects.js rename to testing/mochitest/tests/SimpleTest/MockObjects.js diff --git a/toolkit/content/tests/browser/common/Makefile.in b/toolkit/content/tests/browser/common/Makefile.in index 9d8e2f9be1a..333abd319c9 100644 --- a/toolkit/content/tests/browser/common/Makefile.in +++ b/toolkit/content/tests/browser/common/Makefile.in @@ -45,7 +45,6 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk _COMMON_FILES = \ - mockObjects.js \ mockTransfer.js \ $(NULL) diff --git a/toolkit/content/tests/browser/common/mockTransfer.js b/toolkit/content/tests/browser/common/mockTransfer.js index bdcd1deeaa1..b0c22c90ea8 100644 --- a/toolkit/content/tests/browser/common/mockTransfer.js +++ b/toolkit/content/tests/browser/common/mockTransfer.js @@ -36,8 +36,7 @@ Cc["@mozilla.org/moz/jssubscript-loader;1"] .getService(Ci.mozIJSSubScriptLoader) - .loadSubScript("chrome://mochitests/content/browser/toolkit/content/tests/browser/common/mockObjects.js", - this); + .loadSubScript("chrome://mochikit/content/tests/SimpleTest/MockObjects.js", this); var mockTransferCallback;