Bug 1643272 - Group schemas and docs together for button actions and triggers r=k88hudson

Differential Revision: https://phabricator.services.mozilla.com/D78307

browser/components/newtab/content-src/asrouter/docs/index.rst

@@ -84,6 +84,11 @@ Current templates include\:
 
 Detailed Docs
 -------------
+
+* Read more about `trigger listeners and user action schemas`__.
+
+.. __: /toolkit/components/messaging-system/docs
+
 .. In theory, we ought to be able to use the :glob: directive here to
 .. automatically generate the list below. For unknown reasons, however,
 .. `mach doc` _sometimes_ gets confused and refuses to find patterns like

browser/components/newtab/test/browser/browser.ini

@@ -6,7 +6,6 @@ support-files =
   snippet.json
   topstories.json
   ds_layout.json
-  ../../content-src/asrouter/docs/trigger-listeners.md
 prefs =
   browser.newtabpage.activity-stream.debug=false
   browser.newtabpage.activity-stream.discoverystream.enabled=true
@@ -23,7 +22,6 @@ prefs =
 [browser_as_render.js]
 [browser_asrouter_snippets.js]
 [browser_asrouter_targeting.js]
-[browser_asrouter_trigger_listeners.js]
 [browser_discovery_render.js]
 [browser_discovery_styles.js]
 [browser_enabled_newtabpage.js]
@@ -45,4 +43,3 @@ tags = remote-settings
 [browser_asrouter_experimentsAPILoader.js]
 [browser_asrouter_group_frequency.js]
 [browser_asrouter_group_userprefs.js]
-[browser_asrouter_trigger_docs.js]

toolkit/components/messaging-system/moz.build

@@ -7,13 +7,18 @@
 with Files('**'):
     BUG_COMPONENT = ('Firefox', 'Messaging System')
 
-BROWSER_CHROME_MANIFESTS += ['test/browser/specialMessageActions/browser.ini']
+BROWSER_CHROME_MANIFESTS += [
+    'schemas/SpecialMessageActionSchemas/test/browser/browser.ini',
+    'schemas/TriggerActionSchemas/test/browser/browser.ini',
+]
+
+SPHINX_TREES['docs'] = 'schemas'
 
 XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
 
 TESTING_JS_MODULES += [
-    'schemas/SpecialMessageActionSchemas.js',
-    'schemas/TriggerActionSchemas.js',
+    'schemas/SpecialMessageActionSchemas/SpecialMessageActionSchemas.js',
+    'schemas/TriggerActionSchemas/TriggerActionSchemas.js',
     'test/MSTestUtils.jsm',
 ]
 

toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser.ini

@@ -3,7 +3,7 @@ prefs =
   identity.fxaccounts.remote.root=https://example.com/
 support-files =
   head.js
-  ../../../schemas/SpecialMessageActionSchemas.md
+  ../../SpecialMessageActionSchemas.md
 
 [browser_sma_open_about_page.js]
 [browser_sma_open_awesome_bar.js]

toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_docs.js

@@ -1,5 +1,5 @@
 const TEST_URL =
-  "https://example.com/browser/toolkit/components/messaging-system/test/browser/specialMessageActions/SpecialMessageActionSchemas.md";
+  "https://example.com/browser/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/SpecialMessageActionSchemas.md";
 
 const { SpecialMessageActionSchemas } = ChromeUtils.import(
   "resource://testing-common/SpecialMessageActionSchemas.js"

toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser.ini

@@ -0,0 +1,6 @@
+[DEFAULT]
+support-files =
+  ../../TriggerActionSchemas.md
+
+[browser_asrouter_trigger_listeners.js]
+[browser_asrouter_trigger_docs.js]

toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/browser_asrouter_trigger_docs.js

@@ -1,5 +1,5 @@
 const TEST_URL =
-  "https://example.com/browser/browser/components/newtab/test/browser/trigger-listeners.md";
+  "https://example.com/browser/toolkit/components/messaging-system/schemas/TriggerActionSchemas/test/browser/TriggerActionSchemas.md";
 
 const { TriggerActionSchemas } = ChromeUtils.import(
   "resource://testing-common/TriggerActionSchemas.js"

toolkit/components/messaging-system/schemas/index.rst

@@ -0,0 +1,18 @@
+Messaging System Schemas
+========================
+
+Docs
+----
+
+More information about `Messaging System`__.
+
+.. __: /browser/components/newtab/content-src/asrouter/docs
+
+Triggers and actions
+---------------------
+
+.. toctree::
+  :maxdepth: 2
+
+  SpecialMessageActionSchemas/SpecialMessageActionSchemas.md
+  TriggerActionSchemas/TriggerActionSchemas.md