зеркало из https://github.com/mozilla/pjs.git
Bug 654798 - Fennec browser chrome tests install to the wrong place [r=jmaher]
This commit is contained in:
Родитель
b1f2352fa7
Коммит
67d9885589
|
@ -39,7 +39,7 @@ DEPTH = ../../..
|
|||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
relativesrcdir = mobile/chrome
|
||||
relativesrcdir = mobile/chrome/tests
|
||||
TESTXPI = $(CURDIR)/$(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)/addons
|
||||
ADDONSRC = $(srcdir)/addons
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<Description about="urn:mozilla:install-manifest">
|
||||
<em:id>addon1@tests.mozilla.org</em:id>
|
||||
<em:version>1.0</em:version>
|
||||
<em:updateURL>http://example.com/browser/mobile/chrome/browser_upgrade.rdf</em:updateURL>
|
||||
<em:updateURL>http://example.com/browser/mobile/chrome/tests/browser_upgrade.rdf</em:updateURL>
|
||||
<em:bootstrap>true</em:bootstrap>
|
||||
|
||||
<em:targetApplication>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<Description about="urn:mozilla:install-manifest">
|
||||
<em:id>addon1@tests.mozilla.org</em:id>
|
||||
<em:version>3.0</em:version>
|
||||
<em:updateURL>http://example.com/browser/mobile/chrome/browser_upgrade.rdf</em:updateURL>
|
||||
<em:updateURL>http://example.com/browser/mobile/chrome/tests/browser_upgrade.rdf</em:updateURL>
|
||||
|
||||
<em:targetApplication>
|
||||
<Description>
|
||||
|
|
|
@ -7,7 +7,7 @@ Components.utils.import("resource://gre/modules/AddonUpdateChecker.jsm");
|
|||
Components.utils.import("resource://gre/modules/Services.jsm");
|
||||
Components.utils.import("resource://gre/modules/NetUtil.jsm");
|
||||
|
||||
const RELATIVE_DIR = "browser/mobile/chrome/";
|
||||
const RELATIVE_DIR = "browser/mobile/chrome/tests/";
|
||||
const TESTROOT = "http://example.com/" + RELATIVE_DIR;
|
||||
const TESTROOT2 = "http://example.org/" + RELATIVE_DIR;
|
||||
const PREF_LOGGING_ENABLED = "extensions.logging.enabled";
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
let testURL_01 = chromeRoot + "browser_formsZoom.html";
|
||||
|
||||
let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
|
||||
let testURL_02 = baseURI + "browser_formsZoom.html";
|
||||
messageManager.loadFrameScript(baseURI + "remote_formsZoom.js", true);
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Make sure history is being recorded when we visit websites.
|
||||
*/
|
||||
|
||||
var testURL_01 = "http://mochi.test:8888/browser/mobile/chrome/browser_blank_01.html";
|
||||
var testURL_01 = baseURI + "browser_blank_01.html";
|
||||
|
||||
// A queue to order the tests and a handle for each test
|
||||
var gTests = [];
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
</application>
|
||||
</compatible_applications>
|
||||
<compatible_os>ALL</compatible_os>
|
||||
<install size="2">http://example.com/browser/mobile/chrome/addons/browser_install1_1.xpi</install>
|
||||
<install size="2">http://example.com/browser/mobile/chrome/tests/addons/browser_install1_1.xpi</install>
|
||||
</addon>
|
||||
|
||||
<addon>
|
||||
|
@ -53,6 +53,6 @@
|
|||
</application>
|
||||
</compatible_applications>
|
||||
<compatible_os>ALL</compatible_os>
|
||||
<install size="2">http://example.com/browser/mobile/chrome/addons/browser_install1_2.xpi</install>
|
||||
<install size="2">http://example.com/browser/mobile/chrome/tests/addons/browser_install1_2.xpi</install>
|
||||
</addon>
|
||||
</searchresults>
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
var testURL_01 = chromeRoot + "browser_blank_01.html";
|
||||
var testURL_02 = chromeRoot + "browser_blank_02.html";
|
||||
|
||||
let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
|
||||
var titleURL = baseURI + "browser_title.sjs?";
|
||||
var pngURL = "data:image/gif;base64,R0lGODlhCwALAIAAAAAA3pn/ZiH5BAEAAAEALAAAAAALAAsAAAIUhA+hkcuO4lmNVindo7qyrIXiGBYAOw==";
|
||||
|
||||
|
|
|
@ -4,8 +4,7 @@
|
|||
var gTab;
|
||||
registerCleanupFunction(function() Browser.closeTab(gTab));
|
||||
|
||||
const BASE_URL = "http://mochi.test:8888/browser/mobile/chrome/";
|
||||
const TEST_URL = BASE_URL + "browser_scroll.html";
|
||||
const TEST_URL = baseURI + "browser_scroll.html";
|
||||
|
||||
function test() {
|
||||
waitForExplicitFinish();
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
|
||||
let testURL_01 = baseURI + "browser_scrollbar.sjs?";
|
||||
|
||||
let gCurrentTest = null;
|
||||
|
|
|
@ -37,7 +37,6 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
|
||||
let testURL_blank = baseURI + "browser_blank_01.html";
|
||||
|
||||
const DEFAULT_WIDTH = 800;
|
||||
|
|
|
@ -55,10 +55,10 @@ function handleRequest(request, response) {
|
|||
response.write("<script>window.addEventListener('load', function() { window.removeEventListener('load', arguments.callee, false); document.title = 'This is not a french title'; }, false);</script>");
|
||||
break;
|
||||
case "redirect":
|
||||
response.write("<meta http-equiv='refresh' content='1;url=http://mochi.test:8888/browser/mobile/chrome/browser_title.sjs?no_title'></meta>");
|
||||
response.write("<meta http-equiv='refresh' content='1;url=http://mochi.test:8888/browser/mobile/chrome/tests/browser_title.sjs?no_title'></meta>");
|
||||
break;
|
||||
case "location":
|
||||
response.write("<script>window.addEventListener('load', function() { window.removeEventListener('load', arguments.callee, false); document.location = 'http://mochi.test:8888/browser/mobile/chrome/browser_title.sjs?no_title' ; }, false);</script>");
|
||||
response.write("<script>window.addEventListener('load', function() { window.removeEventListener('load', arguments.callee, false); document.location = 'http://mochi.test:8888/browser/mobile/chrome/tests/browser_title.sjs?no_title' ; }, false);</script>");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
<em:id>toolkit@mozilla.org</em:id>
|
||||
<em:minVersion>0</em:minVersion>
|
||||
<em:maxVersion>*</em:maxVersion>
|
||||
<em:updateLink>http://example.com/browser/mobile/chrome/addons/browser_install1_3.xpi</em:updateLink>
|
||||
<em:updateLink>http://example.com/browser/mobile/chrome/tests/addons/browser_install1_3.xpi</em:updateLink>
|
||||
</Description>
|
||||
</em:targetApplication>
|
||||
</Description>
|
||||
|
|
|
@ -38,7 +38,6 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
|
||||
let testURL_blank = baseURI + "browser_blank_01.html";
|
||||
|
||||
const DEFAULT_WIDTH = 800;
|
||||
|
|
|
@ -83,6 +83,6 @@ let AsyncTests = {
|
|||
let chromeRoot = getRootDirectory(gTestPath);
|
||||
// For some security reasons (which?), loading remote_head using chromeRoot
|
||||
// instead of baseURI make the browser_formsZoom.js test fails.
|
||||
let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
|
||||
let baseURI = "http://mochi.test:8888/browser/mobile/chrome/tests/";
|
||||
messageManager.loadFrameScript(baseURI + "remote_head.js", true);
|
||||
messageManager.loadFrameScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", true);
|
||||
|
|
Загрузка…
Ссылка в новой задаче