wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1199844 - limit webapp debug logging to webapp tests; r=fabrice

Browse Source
This commit is contained in:
Myk Melez 2015-08-30 13:30:21 -07:00
parent aa5d8f970f
commit 9aa1762fb1
58 changed files with 124 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dom/apps/Langpacks.jsm
View File

@ -18,11 +18,16 @@ XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
this.EXPORTED_SYMBOLS = ["Langpacks"]; this.EXPORTED_SYMBOLS = ["Langpacks"];
let debug = Services.prefs.getBoolPref("dom.mozApps.debug") let debug;
? (aMsg) => { function debugPrefObserver() {
dump("-*-*- Langpacks: " + aMsg + "\n"); debug = Services.prefs.getBoolPref("dom.mozApps.debug")
} ? (aMsg) => {
: (aMsg) => {}; dump("-*-*- Langpacks: " + aMsg + "\n");
}
: (aMsg) => {};
}
debugPrefObserver();
Services.prefs.addObserver("dom.mozApps.debug", debugPrefObserver, false);
/** /**
* Langpack support * Langpack support

12
dom/apps/Webapps.jsm
View File

@ -107,10 +107,14 @@ let debug = Cu.import("resource://gre/modules/AndroidLog.jsm", {})
.AndroidLog.d.bind(null, "Webapps"); .AndroidLog.d.bind(null, "Webapps");
#else #else
// Elsewhere, report debug messages only if dom.mozApps.debug is set to true. // Elsewhere, report debug messages only if dom.mozApps.debug is set to true.
// The pref is only checked once, on startup, so restart after changing it. let debug;
let debug = Services.prefs.getBoolPref("dom.mozApps.debug") function debugPrefObserver() {
? (aMsg) => dump("-*- Webapps.jsm : " + aMsg + "\n") debug = Services.prefs.getBoolPref("dom.mozApps.debug")
: (aMsg) => {}; ? (aMsg) => dump("-*- Webapps.jsm : " + aMsg + "\n")
: (aMsg) => {};
}
debugPrefObserver();
Services.prefs.addObserver("dom.mozApps.debug", debugPrefObserver, false);
#endif #endif
function getNSPRErrorCode(err) { function getNSPRErrorCode(err) {

1
dom/apps/tests/chrome.ini
View File

@ -2,6 +2,7 @@
skip-if = buildapp == 'b2g' || os == 'android' skip-if = buildapp == 'b2g' || os == 'android'
support-files = support-files =
asmjs/* asmjs/*
common.js
file_bug_945152.html file_bug_945152.html
file_bug_945152.sjs file_bug_945152.sjs

3
dom/apps/tests/common.js Normal file
View File

@ -0,0 +1,3 @@
function prepareEnv(cb) {
SpecialPowers.pushPrefEnv({"set":[["dom.mozApps.debug", true]]}, cb);
}

1
dom/apps/tests/mochitest.ini
View File

@ -8,6 +8,7 @@ support-files =
addons/update.webapp^headers^ addons/update.webapp^headers^
addons/index.html addons/index.html
chromeAddCert.js chromeAddCert.js
common.js
file_app.sjs file_app.sjs
file_app.template.html file_app.template.html
file_script.template.js file_script.template.js

3
dom/apps/tests/test_app_addons.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1042881
<title>Test for Bug 923897 - Test apps as addons</title> <title>Test for Bug 923897 - Test apps as addons</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<script type="application/javascript;version=1.7"> <script type="application/javascript;version=1.7">
/** /**
@ -203,7 +204,7 @@ function runTest() {
</script> </script>
</head> </head>
<body onload="go()"> <body onload="prepareEnv(go)">
<p id="display"></p> <p id="display"></p>
<div id="content" style="display: none"> <div id="content" style="display: none">
</div> </div>

3
dom/apps/tests/test_app_enabled.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={1XXXXXX}
<title>Test for Bug {1072090}</title> <title>Test for Bug {1072090}</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head> </head>
<body> <body>
@ -121,7 +122,7 @@ function runTest() {
is(request.result.length, initialAppsCount, "All apps are uninstalled."); is(request.result.length, initialAppsCount, "All apps are uninstalled.");
} }
addLoadEvent(go); addLoadEvent(() => prepareEnv(go));
</script> </script>
</pre> </pre>

3
dom/apps/tests/test_app_update.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=826058
<meta charset="utf-8"> <meta charset="utf-8">
<title>Test for Bug 826058</title> <title>Test for Bug 826058</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="application/javascript;version=1.7"> <script type="application/javascript;version=1.7">
@ -278,7 +279,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=826058
</script> </script>
</head> </head>
<body onload="go()"> <body onload="prepareEnv(go)">
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=826058">Mozilla Bug 826058</a> <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=826058">Mozilla Bug 826058</a>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=863337">Mozilla Bug 863337</a> <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=863337">Mozilla Bug 863337</a>
<p id="display"></p> <p id="display"></p>

3
dom/apps/tests/test_bug_1168300.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1168300
<meta charset="utf-8"> <meta charset="utf-8">
<title>Test for Bug 1168300</title> <title>Test for Bug 1168300</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="application/javascript;version=1.7"> <script type="application/javascript;version=1.7">
@ -111,7 +112,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1168300
SimpleTest.waitForExplicitFinish(); SimpleTest.waitForExplicitFinish();
</script> </script>
</head> </head>
<body onload="go()"> <body onload="prepareEnv(go)">
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1168300">Mozilla Bug 1168300</a> <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1168300">Mozilla Bug 1168300</a>
<p id="display"></p> <p id="display"></p>
<div id="content" style="display: none"> <div id="content" style="display: none">

3
dom/apps/tests/test_bug_795164.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=795164
<meta charset="utf-8"> <meta charset="utf-8">
<title>Test for Bug 795164</title> <title>Test for Bug 795164</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="application/javascript;version=1.7"> <script type="application/javascript;version=1.7">
@ -96,7 +97,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=795164
} }
</script> </script>
</head> </head>
<body onload="go()"> <body onload="prepareEnv(go)">
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=795164">Mozilla Bug 795164</a> <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=795164">Mozilla Bug 795164</a>
<p id="display"></p> <p id="display"></p>
<div id="content" style="display: none"> <div id="content" style="display: none">

3
dom/apps/tests/test_bug_945152.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=945152
<meta charset="utf-8"> <meta charset="utf-8">
<title>Test for Bug 945152</title> <title>Test for Bug 945152</title>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
<script type="application/javascript;version=1.7"> <script type="application/javascript;version=1.7">
@ -162,7 +163,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=945152
</script> </script>
</head> </head>
<body onload="go()"> <body onload="prepareEnv(go)">
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=945152">Mozilla Bug 945152</a> <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=945152">Mozilla Bug 945152</a>
<p id="display"></p> <p id="display"></p>
<div id="content" style="display: none"> <div id="content" style="display: none">

3
dom/apps/tests/test_checkInstalled.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={1191516}
<title>Test for Bug {1191516}</title> <title>Test for Bug {1191516}</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head> </head>
<body> <body>
@ -92,7 +93,7 @@ function runTest() {
yield undefined; yield undefined;
} }
addLoadEvent(go); addLoadEvent(() => prepareEnv(go));
</script> </script>
</pre> </pre>

3
dom/apps/tests/test_import_export.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={982874}
<title>Test for Bug {982874}</title> <title>Test for Bug {982874}</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="common.js"></script>
<script type="text/javascript" src="test_packaged_app_common.js"></script> <script type="text/javascript" src="test_packaged_app_common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head> </head>
@ -322,7 +323,7 @@ function runTest() {
is(request.result.length, initialAppsCount, "All apps are uninstalled."); is(request.result.length, initialAppsCount, "All apps are uninstalled.");
} }
addLoadEvent(go); addLoadEvent(() => prepareEnv(go));
</script> </script>
</pre> </pre>

3
dom/apps/tests/test_install_dev_mode.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={1111961}
<title>Test for Bug {1111961}</title> <title>Test for Bug {1111961}</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head> </head>
<body> <body>
@ -114,7 +115,7 @@ function runTest() {
is(request.result.length, initialAppsCount, "All apps are uninstalled."); is(request.result.length, initialAppsCount, "All apps are uninstalled.");
} }
addLoadEvent(go); addLoadEvent(() => prepareEnv(go));
</script> </script>
</pre> </pre>

3
dom/apps/tests/test_install_multiple_apps_origin.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={778277}
<title>Test for Bug {778277}</title> <title>Test for Bug {778277}</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head> </head>
<body> <body>
@ -116,7 +117,7 @@ function runTest() {
is(request.result.length, initialAppsCount, "All apps are uninstalled."); is(request.result.length, initialAppsCount, "All apps are uninstalled.");
} }
addLoadEvent(go); addLoadEvent(() => prepareEnv(go));
</script> </script>
</pre> </pre>

3
dom/apps/tests/test_install_receipts.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={960837}
<title>Test for Bug {960837}</title> <title>Test for Bug {960837}</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head> </head>
<body> <body>
@ -206,7 +207,7 @@ function runTest() {
yield undefined; yield undefined;
} }
addLoadEvent(go); addLoadEvent(() => prepareEnv(go));
</script> </script>
</pre> </pre>

3
dom/apps/tests/test_langpacks.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1108096
<title>Test for Bug 1108096 - Langpack support</title> <title>Test for Bug 1108096 - Langpack support</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
<script type="application/javascript;version=1.7"> <script type="application/javascript;version=1.7">
/** /**
@ -305,7 +306,7 @@ function runTest() {
</script> </script>
</head> </head>
<body onload="go()"> <body onload="prepareEnv(go)">
<p id="display"></p> <p id="display"></p>
<div id="content" style="display: none"> <div id="content" style="display: none">
</div> </div>

3
dom/apps/tests/test_marketplace_pkg_install.html
View File

@ -9,6 +9,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=989806
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="test_packaged_app_common.js"></script> <script type="text/javascript" src="test_packaged_app_common.js"></script>
<script type="text/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head> </head>
<body> <body>
@ -341,7 +342,7 @@ PackagedTestHelper.setSteps([
} }
]); ]);
addLoadEvent(PackagedTestHelper.start); addLoadEvent(() => prepareEnv(() => PackagedTestHelper.start()));
</script> </script>
</pre> </pre>

3
dom/apps/tests/test_operator_app_install.js
View File

@ -212,6 +212,9 @@ function checkAppState(aApp,
} }
var steps = [ var steps = [
function() {
prepareEnv(next);
},
function() { function() {
setupDataDirs(next); setupDataDirs(next);
ok(true, "Data directory set up to " + singlevariantDir); ok(true, "Data directory set up to " + singlevariantDir);

1
dom/apps/tests/test_operator_app_install.xul
View File

@ -8,6 +8,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=893800
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript" <script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="common.js"/>
<!-- test results are displayed in the html:body --> <!-- test results are displayed in the html:body -->
<body xmlns="http://www.w3.org/1999/xhtml"> <body xmlns="http://www.w3.org/1999/xhtml">

3
dom/apps/tests/test_packaged_app_asmjs.html
View File

@ -10,6 +10,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=997886
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" <script type="application/javascript"
src="chrome://mochikit/content/chrome-harness.js"></script> src="chrome://mochikit/content/chrome-harness.js"></script>
<script type="application/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
<script type="application/javascript;version=1.7"> <script type="application/javascript;version=1.7">
@ -229,7 +230,7 @@ function runTest() {
</script> </script>
</head> </head>
<body onload="go()"> <body onload="prepareEnv(go)">
<p id="display"></p> <p id="display"></p>
<div id="content" style="display: none"> <div id="content" style="display: none">
</div> </div>

3
dom/apps/tests/test_packaged_app_install.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={821589}
<title>Test for Bug {821589} Packaged apps installation and update</title> <title>Test for Bug {821589} Packaged apps installation and update</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="common.js"></script>
<script type="text/javascript" src="test_packaged_app_common.js"></script> <script type="text/javascript" src="test_packaged_app_common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head> </head>
@ -347,7 +348,7 @@ var steps = [
PackagedTestHelper.setSteps(steps); PackagedTestHelper.setSteps(steps);
addLoadEvent(PackagedTestHelper.start); addLoadEvent(() => prepareEnv(() => PackagedTestHelper.start()));
</script> </script>
</pre> </pre>

3
dom/apps/tests/test_packaged_app_update.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={900533}
<title>Test for Bug {900533} Packaged app update tests</title> <title>Test for Bug {900533} Packaged app update tests</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="common.js"></script>
<script type="text/javascript" src="test_packaged_app_common.js"></script> <script type="text/javascript" src="test_packaged_app_common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head> </head>
@ -346,7 +347,7 @@ PackagedTestHelper.setSteps(steps);
// install tests // install tests
miniManifestURL = PackagedTestHelper.gSJS + "?getManifest=true&appToUpdate&testNameChange"; miniManifestURL = PackagedTestHelper.gSJS + "?getManifest=true&appToUpdate&testNameChange";
addLoadEvent(PackagedTestHelper.start); addLoadEvent(() => prepareEnv(() => PackagedTestHelper.start()));
</script> </script>
</pre> </pre>

3
dom/apps/tests/test_receipt_operations.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={757226}
<title>Test for Bug {757226} Implement mozApps app.replaceReceipt</title> <title>Test for Bug {757226} Implement mozApps app.replaceReceipt</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head> </head>
<body> <body>
@ -231,7 +232,7 @@ function runTest() {
ok(true, "App uninstalled"); ok(true, "App uninstalled");
} }
addLoadEvent(go); addLoadEvent(() => prepareEnv(go));
</script> </script>
</pre> </pre>

3
dom/apps/tests/test_signed_pkg_install.html
View File

@ -8,6 +8,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=880043
<title>Test for Bug 880043 Packaged apps installation and update</title> <title>Test for Bug 880043 Packaged apps installation and update</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="common.js"></script>
<script type="text/javascript" src="test_packaged_app_common.js"></script> <script type="text/javascript" src="test_packaged_app_common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head> </head>
@ -269,7 +270,7 @@ var steps = [
PackagedTestHelper.setSteps(steps); PackagedTestHelper.setSteps(steps);
PackagedTestHelper.gSJSPath = gSJSPath; PackagedTestHelper.gSJSPath = gSJSPath;
addLoadEvent(PackagedTestHelper.start); addLoadEvent(() => prepareEnv(() => PackagedTestHelper.start()));
</script> </script>
</pre> </pre>

3
dom/apps/tests/test_theme_role.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={1011738}
<title>Test for Bug {1011738}</title> <title>Test for Bug {1011738}</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="common.js"></script>
<script type="text/javascript" src="test_packaged_app_common.js"></script> <script type="text/javascript" src="test_packaged_app_common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head> </head>
@ -102,7 +103,7 @@ function runTest() {
yield undefined; yield undefined;
} }
addLoadEvent(go); addLoadEvent(() => prepareEnv(go));
</script> </script>
</pre> </pre>

3
dom/apps/tests/test_third_party_homescreen.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={1097468}
<title>Test for Bug {1097468}</title> <title>Test for Bug {1097468}</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head> </head>
<body> <body>
@ -192,7 +193,7 @@ function runTest() {
navigator.mozApps.mgmt.onuninstall = null; navigator.mozApps.mgmt.onuninstall = null;
} }
addLoadEvent(go); addLoadEvent(() => prepareEnv(go));
</script> </script>
</pre> </pre>

3
dom/apps/tests/test_uninstall_errors.html
View File

@ -8,6 +8,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=830258
<title>Test for Bug 830258</title> <title>Test for Bug 830258</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="text/javascript" src="common.js"></script>
<script type="application/javascript;version=1.7"> <script type="application/javascript;version=1.7">
/** Test for Bug 830258 **/ /** Test for Bug 830258 **/
@ -96,7 +97,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=830258
} }
</script> </script>
</head> </head>
<body onload="go()"> <body onload="prepareEnv(go)">
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=830258">Mozilla Bug 830258</a> <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=830258">Mozilla Bug 830258</a>
<p id="display"></p> <p id="display"></p>
<div id="content" style="display: none"> <div id="content" style="display: none">

3
dom/apps/tests/test_web_app_install.html
View File

@ -7,6 +7,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id={1075716}
<title>Install web app from manifest with application/manifest+json MIME type</title> <title>Install web app from manifest with application/manifest+json MIME type</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script> <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head> </head>
<body> <body>
@ -165,7 +166,7 @@ function runTest() {
is(request.result.length, initialAppsCount, "Correct number of apps."); is(request.result.length, initialAppsCount, "Correct number of apps.");
} }
addLoadEvent(go); addLoadEvent(() => prepareEnv(go));
</script> </script>
</pre> </pre>

3
dom/apps/tests/test_widget.html
View File

@ -5,6 +5,7 @@
<title>Test for Widget</title> <title>Test for Widget</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="file_test_widget.js"></script> <script type="application/javascript" src="file_test_widget.js"></script>
<script type="application/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head> </head>
<body> <body>
@ -12,7 +13,7 @@
<script type="application/javascript;version=1.7"> <script type="application/javascript;version=1.7">
SimpleTest.waitForExplicitFinish(); SimpleTest.waitForExplicitFinish();
gHasBrowserPermission = false; gHasBrowserPermission = false;
runTest(); prepareEnv(runTest);
</script> </script>
</body> </body>
</html> </html>

3
dom/apps/tests/test_widget_browser.html
View File

@ -5,6 +5,7 @@
<title>Test for DataStore - basic operation on a readonly db</title> <title>Test for DataStore - basic operation on a readonly db</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="file_test_widget.js"></script> <script type="application/javascript" src="file_test_widget.js"></script>
<script type="application/javascript" src="common.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head> </head>
<body> <body>
@ -12,7 +13,7 @@
<script type="application/javascript;version=1.7"> <script type="application/javascript;version=1.7">
SimpleTest.waitForExplicitFinish(); SimpleTest.waitForExplicitFinish();
gHasBrowserPermission = true; gHasBrowserPermission = true;
runTest(); prepareEnv(runTest);
</script> </script>
</body> </body>
</html> </html>

4
dom/apps/tests/unit/head.js Normal file
View File

@ -0,0 +1,4 @@
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
Cu.import("resource:///modules/Services.jsm");
var dom_mozApps_debug = Services.prefs.getBoolPref("dom.mozApps.debug");
Services.prefs.setBoolPref("dom.mozApps.debug", true);

1
dom/apps/tests/unit/tail.js Normal file
View File

@ -0,0 +1 @@
Services.prefs.setBoolPref("dom.mozApps.debug", dom_mozApps_debug);

3
dom/apps/tests/unit/test_has_widget_criterion.js
View File

@ -1,10 +1,7 @@
/* Any copyright is dedicated to the Public Domain. /* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */ http://creativecommons.org/publicdomain/zero/1.0/ */
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
Cu.import("resource:///modules/AppsUtils.jsm"); Cu.import("resource:///modules/AppsUtils.jsm");
Cu.import("resource:///modules/Services.jsm");
add_test(function test_has_widget_criterion() { add_test(function test_has_widget_criterion() {

3
dom/apps/tests/unit/test_inter_app_comm_service.js
View File

@ -1,9 +1,6 @@
/* Any copyright is dedicated to the Public Domain. /* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */ http://creativecommons.org/publicdomain/zero/1.0/ */
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/InterAppCommService.jsm"); Cu.import("resource://gre/modules/InterAppCommService.jsm");
Cu.import("resource://gre/modules/AppConstants.jsm"); Cu.import("resource://gre/modules/AppConstants.jsm");

2
dom/apps/tests/unit/test_moziapplication.js
View File

@ -1,8 +1,6 @@
/* Any copyright is dedicated to the Public Domain. /* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */ http://creativecommons.org/publicdomain/zero/1.0/ */
const {interfaces: Ci, utils: Cu} = Components;
Cu.import("resource:///modules/AppsUtils.jsm"); Cu.import("resource:///modules/AppsUtils.jsm");
add_test(() => { add_test(() => {

4
dom/apps/tests/unit/xpcshell.ini
View File

@ -1,6 +1,6 @@
[DEFAULT] [DEFAULT]
head = head = head.js
tail = tail = tail.js
[test_has_widget_criterion.js] [test_has_widget_criterion.js]
[test_inter_app_comm_service.js] [test_inter_app_comm_service.js]

2
testing/profiles/prefs_general.js
View File

@ -271,8 +271,6 @@ user_pref("browser.translation.engine", "bing");
// Make sure we don't try to load snippets from the network. // Make sure we don't try to load snippets from the network.
user_pref("browser.aboutHomeSnippets.updateUrl", "nonexistent://test"); user_pref("browser.aboutHomeSnippets.updateUrl", "nonexistent://test");
// Enable debug logging in the mozApps implementation.
user_pref("dom.mozApps.debug", true);
// Enable apps customizations // Enable apps customizations
user_pref("dom.apps.customization.enabled", true); user_pref("dom.apps.customization.enabled", true);

4
toolkit/webapps/tests/head.js
View File

@ -586,3 +586,7 @@ AlertsService.init();
SimpleTest.registerCleanupFunction(() => { SimpleTest.registerCleanupFunction(() => {
AlertsService.restore(); AlertsService.restore();
}); });
function prepareEnv(cb) {
SpecialPowers.pushPrefEnv({"set":[["dom.mozApps.debug", true]]}, cb);
}

4
toolkit/webapps/tests/test_custom_origin.xul
View File

@ -125,10 +125,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_custom_origin_uninstall_install.xul
View File

@ -161,10 +161,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_hosted.xul
View File

@ -147,10 +147,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_hosted_checkforupdates_from_webapp_runtime.xul
View File

@ -106,10 +106,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_hosted_icons.xul
View File

@ -147,10 +147,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_hosted_launch.xul
View File

@ -93,10 +93,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_hosted_launch_no_registry.xul
View File

@ -93,10 +93,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_hosted_uninstall.xul
View File

@ -135,10 +135,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_hosted_update_from_webapp_runtime.xul
View File

@ -110,10 +110,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_install_appcache.xul
View File

@ -116,10 +116,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_non_ascii_app_name.xul
View File

@ -148,10 +148,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_packaged.xul
View File

@ -164,10 +164,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_packaged_checkforupdates_from_webapp_runtime.xul
View File

@ -118,10 +118,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_packaged_icons.xul
View File

@ -160,10 +160,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_packaged_launch.xul
View File

@ -101,10 +101,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_packaged_launch_no_registry.xul
View File

@ -101,10 +101,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_packaged_uninstall.xul
View File

@ -144,10 +144,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_packaged_update_from_webapp_runtime.xul
View File

@ -124,10 +124,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>

4
toolkit/webapps/tests/test_webapp_runtime_executable_update.xul
View File

@ -152,10 +152,10 @@ let runTest = Task.async(function*() {
SimpleTest.finish(); SimpleTest.finish();
}); });
runTest().catch((e) => { prepareEnv(() => runTest().catch((e) => {
ok(false, "Error during test: " + e); ok(false, "Error during test: " + e);
SimpleTest.finish(); SimpleTest.finish();
}); }));
]]> ]]>
</script> </script>