Bug 1424571 - Move all notification tests to dom/notification; r=baku
authorKyle Machulis <kyle@nonpolynomial.com>
Fri, 08 Dec 2017 18:38:13 -0800
changeset 396029 d47afd9b9df22cb39eac5a93e81691e81b2029f5
parent 396028 a2403602d9b0c17ab9ac69f10911fe79f06fdbac
child 396030 ea64f1bb6c97bfc9437a8841b1d9a2bc54938016
push id33068
push usertoros@mozilla.com
push dateMon, 11 Dec 2017 09:57:17 +0000
treeherdermozilla-central@e9262199b3a7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbaku
bugs1424571
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1424571 - Move all notification tests to dom/notification; r=baku Tests were split between dom/notification and dom/test/mochitest/notification. Moving them all to the same place. MozReview-Commit-ID: IP1YtIBmHcD
.eslintignore
dom/notification/moz.build
dom/notification/test/mochitest/MockServices.js
dom/notification/test/mochitest/NotificationTest.js
dom/notification/test/mochitest/mochitest.ini
dom/notification/test/mochitest/test_bug931307.html
dom/notification/test/mochitest/test_notification_basics.html
dom/notification/test/mochitest/test_notification_storage.html
dom/tests/mochitest/notification/MockServices.js
dom/tests/mochitest/notification/NotificationTest.js
dom/tests/mochitest/notification/mochitest.ini
dom/tests/mochitest/notification/test_bug931307.html
dom/tests/mochitest/notification/test_notification_basics.html
dom/tests/mochitest/notification/test_notification_storage.html
dom/tests/moz.build
dom/workers/test/mochitest.ini
dom/workers/test/serviceworkers/mochitest.ini
dom/workers/test/serviceworkers/test_notification_constructor_error.html
dom/workers/test/serviceworkers/test_notification_get.html
dom/workers/test/serviceworkers/test_notificationclick-otherwindow.html
dom/workers/test/serviceworkers/test_notificationclick.html
dom/workers/test/serviceworkers/test_notificationclick_focus.html
dom/workers/test/serviceworkers/test_notificationclose.html
dom/workers/test/serviceworkers/test_openWindow.html
dom/workers/test/test_notification.html
dom/workers/test/test_notification_child.html
dom/workers/test/test_notification_permission.html
--- a/.eslintignore
+++ b/.eslintignore
@@ -236,16 +236,17 @@ dom/manifest/**
 dom/mathml/**
 dom/media/**
 !dom/media/*.js*
 dom/messagechannel/**
 dom/network/**
 dom/notification/Notification*.*
 dom/notification/test/browser/**
 dom/notification/test/unit/**
+dom/notification/test/mochitest/**
 dom/offline/**
 dom/payments/**
 dom/performance/**
 dom/permission/**
 dom/plugins/test/mochitest/**
 dom/plugins/test/unit/**
 dom/power/**
 dom/presentation/Presentation*.js
--- a/dom/notification/moz.build
+++ b/dom/notification/moz.build
@@ -32,11 +32,12 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/dom/base',
     '/dom/ipc',
     '/dom/workers',
 ]
 
 BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+MOCHITEST_MANIFESTS += ['test/mochitest/mochitest.ini']
 
 if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
     CXXFLAGS += ['-Wno-error=shadow']
rename from dom/tests/mochitest/notification/MockServices.js
rename to dom/notification/test/mochitest/MockServices.js
rename from dom/tests/mochitest/notification/NotificationTest.js
rename to dom/notification/test/mochitest/NotificationTest.js
rename from dom/tests/mochitest/notification/mochitest.ini
rename to dom/notification/test/mochitest/mochitest.ini
rename from dom/tests/mochitest/notification/test_bug931307.html
rename to dom/notification/test/mochitest/test_bug931307.html
rename from dom/tests/mochitest/notification/test_notification_basics.html
rename to dom/notification/test/mochitest/test_notification_basics.html
rename from dom/tests/mochitest/notification/test_notification_storage.html
rename to dom/notification/test/mochitest/test_notification_storage.html
--- a/dom/tests/moz.build
+++ b/dom/tests/moz.build
@@ -80,19 +80,16 @@ with Files("mochitest/general/**"):
     BUG_COMPONENT = ("Core", "DOM")
 
 with Files("mochitest/geolocation/**"):
     BUG_COMPONENT = ("Core", "Geolocation")
 
 with Files("mochitest/localstorage/**"):
     BUG_COMPONENT = ("Core", "DOM")
 
-with Files("mochitest/notification/**"):
-    BUG_COMPONENT = ("Core", "DOM")
-
 with Files("mochitest/orientation/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("mochitest/orientation/*507902*"):
     BUG_COMPONENT = ("Core", "Layout: Images")
 
 with Files("mochitest/pointerlock/**"):
     BUG_COMPONENT = ("Core", "DOM")
@@ -164,17 +161,16 @@ MOCHITEST_MANIFESTS += [
     'mochitest/dom-level1-core/mochitest.ini',
     'mochitest/dom-level2-core/mochitest.ini',
     'mochitest/dom-level2-html/mochitest.ini',
     'mochitest/fetch/mochitest.ini',
     'mochitest/gamepad/mochitest.ini',
     'mochitest/general/mochitest.ini',
     'mochitest/geolocation/mochitest.ini',
     'mochitest/localstorage/mochitest.ini',
-    'mochitest/notification/mochitest.ini',
     'mochitest/orientation/mochitest.ini',
     'mochitest/pointerlock/mochitest.ini',
     'mochitest/script/mochitest.ini',
     'mochitest/sessionstorage/mochitest.ini',
     'mochitest/storageevent/mochitest.ini',
     'mochitest/webcomponents/mochitest.ini',
     'mochitest/whatwg/mochitest.ini',
 ]
--- a/dom/workers/test/mochitest.ini
+++ b/dom/workers/test/mochitest.ini
@@ -90,18 +90,18 @@ support-files =
   importScripts_3rdParty_worker.js
   worker_bug1278777.js
   worker_setTimeoutWith0.js
   worker_bug1301094.js
   script_createFile.js
   worker_suspended.js
   window_suspended.html
   !/dom/base/test/file_bug945152.jar
-  !/dom/tests/mochitest/notification/MockServices.js
-  !/dom/tests/mochitest/notification/NotificationTest.js
+  !/dom/notification/test/mochitest/MockServices.js
+  !/dom/notification/test/mochitest/NotificationTest.js
   !/dom/xhr/tests/relativeLoad_import.js
   !/dom/xhr/tests/relativeLoad_worker.js
   !/dom/xhr/tests/relativeLoad_worker2.js
   !/dom/xhr/tests/subdir/relativeLoad_sub_worker.js
   !/dom/xhr/tests/subdir/relativeLoad_sub_worker2.js
   !/dom/xhr/tests/subdir/relativeLoad_sub_import.js
 
 [test_404.html]
--- a/dom/workers/test/serviceworkers/mochitest.ini
+++ b/dom/workers/test/serviceworkers/mochitest.ini
@@ -207,18 +207,18 @@ support-files =
   file_js_cache.html
   file_js_cache_with_sri.html
   file_js_cache.js
   file_js_cache_save_after_load.html
   file_js_cache_save_after_load.js
   file_js_cache_syntax_error.html
   file_js_cache_syntax_error.js
   !/dom/security/test/cors/file_CrossSiteXHR_server.sjs
-  !/dom/tests/mochitest/notification/MockServices.js
-  !/dom/tests/mochitest/notification/NotificationTest.js
+  !/dom/notification/test/mochitest/MockServices.js
+  !/dom/notification/test/mochitest/NotificationTest.js
   blocking_install_event_worker.js
   sw_bad_mime_type.js
   sw_bad_mime_type.js^headers^
   error_reporting_helpers.js
   fetch.js
   hello.html
   create_another_sharedWorker.html
   sharedWorker_fetch.js
--- a/dom/workers/test/serviceworkers/test_notification_constructor_error.html
+++ b/dom/workers/test/serviceworkers/test_notification_constructor_error.html
@@ -2,18 +2,18 @@
   Any copyright is dedicated to the Public Domain.
   http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Bug XXXXXXX - Check that Notification constructor throws in ServiceWorkerGlobalScope</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/MockServices.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/NotificationTest.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/MockServices.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/NotificationTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <p id="display"></p>
 <div id="content" style="display: none"></div>
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
--- a/dom/workers/test/serviceworkers/test_notification_get.html
+++ b/dom/workers/test/serviceworkers/test_notification_get.html
@@ -1,15 +1,15 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>ServiceWorkerRegistration.getNotifications() on main thread and worker thread.</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/MockServices.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/NotificationTest.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/MockServices.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/NotificationTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <p id="display"></p>
 <div id="content" style="display: none"></div>
 <pre id="test"></pre>
 <script type="text/javascript">
 
--- a/dom/workers/test/serviceworkers/test_notificationclick-otherwindow.html
+++ b/dom/workers/test/serviceworkers/test_notificationclick-otherwindow.html
@@ -1,18 +1,18 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=916893
 -->
 <head>
   <title>Bug 1114554 - Test ServiceWorkerGlobalScope.notificationclick event.</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/MockServices.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/NotificationTest.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/MockServices.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/NotificationTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1114554">Bug 1114554</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 </div>
 <pre id="test">
--- a/dom/workers/test/serviceworkers/test_notificationclick.html
+++ b/dom/workers/test/serviceworkers/test_notificationclick.html
@@ -1,18 +1,18 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=916893
 -->
 <head>
   <title>Bug 1114554 - Test ServiceWorkerGlobalScope.notificationclick event.</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/MockServices.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/NotificationTest.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/MockServices.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/NotificationTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1114554">Bug 1114554</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 </div>
 <pre id="test">
--- a/dom/workers/test/serviceworkers/test_notificationclick_focus.html
+++ b/dom/workers/test/serviceworkers/test_notificationclick_focus.html
@@ -1,18 +1,18 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=916893
 -->
 <head>
   <title>Bug 1144660 - Test client.focus() permissions on notification click</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/MockServices.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/NotificationTest.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/MockServices.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/NotificationTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1114554">Bug 1114554</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 </div>
 <pre id="test">
--- a/dom/workers/test/serviceworkers/test_notificationclose.html
+++ b/dom/workers/test/serviceworkers/test_notificationclose.html
@@ -1,18 +1,18 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=1265841
 -->
 <head>
   <title>Bug 1265841 - Test ServiceWorkerGlobalScope.notificationclose event.</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/MockServices.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/NotificationTest.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/MockServices.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/NotificationTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1265841">Bug 1265841</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 </div>
 <pre id="test">
--- a/dom/workers/test/serviceworkers/test_openWindow.html
+++ b/dom/workers/test/serviceworkers/test_openWindow.html
@@ -1,18 +1,18 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=1172870
 -->
 <head>
   <title>Bug 1172870 - Test clients.openWindow</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/MockServices.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/NotificationTest.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/MockServices.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/NotificationTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1172870">Bug 1172870</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 </div>
 <pre id="test">
--- a/dom/workers/test/test_notification.html
+++ b/dom/workers/test/test_notification.html
@@ -1,18 +1,18 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=916893
 -->
 <head>
   <title>Bug 916893</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/MockServices.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/NotificationTest.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/MockServices.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/NotificationTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=916893">Bug 916893</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 </div>
 <pre id="test">
--- a/dom/workers/test/test_notification_child.html
+++ b/dom/workers/test/test_notification_child.html
@@ -1,18 +1,18 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=916893
 -->
 <head>
   <title>Bug 916893 - Test Notifications in child workers.</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/MockServices.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/NotificationTest.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/MockServices.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/NotificationTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=916893">Bug 916893</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 </div>
 <pre id="test">
--- a/dom/workers/test/test_notification_permission.html
+++ b/dom/workers/test/test_notification_permission.html
@@ -1,18 +1,18 @@
 <!DOCTYPE HTML>
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=916893
 -->
 <head>
   <title>Bug 916893 - Make sure error is fired on Notification if permission is denied.</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/MockServices.js"></script>
-  <script type="text/javascript" src="/tests/dom/tests/mochitest/notification/NotificationTest.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/MockServices.js"></script>
+  <script type="text/javascript" src="/tests/dom/notification/test/mochitest/NotificationTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=916893">Bug 916893</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 </div>
 <pre id="test">