Bug 1286530 - Switch mozChromeNotifications mochitests to chrome
MozReview-Commit-ID: EFmqrkGXjms
Conflicts:
dom/tests/mochitest/notification/mochitest.ini
new file mode 100644
--- /dev/null
+++ b/dom/tests/mochitest/notification/chrome.ini
@@ -0,0 +1,8 @@
+[DEFAULT]
+
+support-files =
+ MockServices.js
+ NotificationTest.js
+
+[test_notification_noresend.html]
+skip-if = (toolkit == 'gonk') # Mochitest on Gonk registers an app manifest that messes with the logic
--- a/dom/tests/mochitest/notification/mochitest.ini
+++ b/dom/tests/mochitest/notification/mochitest.ini
@@ -4,11 +4,9 @@ support-files =
MockServices.js
NotificationTest.js
[test_notification_basics.html]
[test_notification_storage.html]
[test_bug931307.html]
skip-if = (os == 'android') # Bug 1258975 on android.
[test_notification_resend.html]
-skip-if = (buildapp != 'b2g' && buildapp != 'mulet') || e10s # On e10s, faking the app seems to be failing
-[test_notification_noresend.html]
-skip-if = (toolkit == 'gonk') # Mochitest on Gonk registers an app manifest that messes with the logic
+skip-if = true ### Bug 1255339: blacklist because no more mozApps
--- a/dom/tests/mochitest/notification/test_notification_noresend.html
+++ b/dom/tests/mochitest/notification/test_notification_noresend.html
@@ -1,16 +1,16 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Testing mozResendAllNotifications() resend behavior for Pages</title>
- <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+ <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="MockServices.js"></script>
<script type="text/javascript" src="NotificationTest.js"></script>
- <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+ <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1159128">Bug 1159128</a>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test"></pre>
<script type="text/javascript">
var info = NotificationTest.info;
--- a/dom/tests/moz.build
+++ b/dom/tests/moz.build
@@ -31,16 +31,17 @@ MOCHITEST_MANIFESTS += [
]
MOCHITEST_CHROME_MANIFESTS += [
'mochitest/beacon/chrome.ini',
'mochitest/chrome/chrome.ini',
'mochitest/general/chrome.ini',
'mochitest/geolocation/chrome.ini',
'mochitest/localstorage/chrome.ini',
+ 'mochitest/notification/chrome.ini',
'mochitest/sessionstorage/chrome.ini',
'mochitest/whatwg/chrome.ini',
]
if CONFIG['MOZ_GAMEPAD']:
MOCHITEST_MANIFESTS += [
'mochitest/gamepad/mochitest.ini',
]