Bug 1547660 - Move tabs as first category displayed + fix tests r=jdescottes
authorOla Gasidlo <ogasidlo@mozilla.com>
Mon, 29 Apr 2019 14:39:53 +0000
changeset 530699 5d8653071324fa61f37cee5d1beee64da5f82e06
parent 530698 8551820a482fd3cadd64b498514020480ff0e275
child 530700 ee0dd3b092d03d28da65f5ee686db942b9ce8ec0
child 530713 799e477bd09d283ad02397cb1daf154ed9379a92
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdescottes
bugs1547660
milestone68.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 1547660 - Move tabs as first category displayed + fix tests r=jdescottes Move tabs as first category in "this firefox" + remote runtime display Differential Revision: https://phabricator.services.mozilla.com/D29185
devtools/client/aboutdebugging-new/src/components/RuntimePage.js
devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_thisfirefox.js
--- a/devtools/client/aboutdebugging-new/src/components/RuntimePage.js
+++ b/devtools/client/aboutdebugging-new/src/components/RuntimePage.js
@@ -148,16 +148,25 @@ class RuntimePage extends PureComponent 
     return dom.article(
       {
         className: "page js-runtime-page",
       },
       RuntimeInfo({ ...runtimeDetails.info, runtimeId, dispatch }),
       RuntimeActions({ dispatch, runtimeId, runtimeDetails }),
       runtimeDetails.serviceWorkersAvailable ? null : ServiceWorkersWarning(),
       CompatibilityWarning({ compatibilityReport }),
+      this.renderDebugTargetPane("Tabs",
+                                 this.getIconByType(DEBUG_TARGETS.TAB),
+                                 tabs,
+                                 null,
+                                 InspectAction,
+                                 null,
+                                 TabDetail,
+                                 DEBUG_TARGET_PANE.TAB,
+                                 "about-debugging-runtime-tabs"),
       this.renderDebugTargetPane("Temporary Extensions",
                                  this.getIconByType(DEBUG_TARGETS.EXTENSION),
                                  temporaryExtensions,
                                  this.renderTemporaryExtensionInstallSection(),
                                  ExtensionAction,
                                  TemporaryExtensionAdditionalActions,
                                  TemporaryExtensionDetail,
                                  DEBUG_TARGET_PANE.TEMPORARY_EXTENSION,
@@ -166,25 +175,16 @@ class RuntimePage extends PureComponent 
                                  this.getIconByType(DEBUG_TARGETS.EXTENSION),
                                  installedExtensions,
                                  null,
                                  ExtensionAction,
                                  null,
                                  ExtensionDetail,
                                  DEBUG_TARGET_PANE.INSTALLED_EXTENSION,
                                  "about-debugging-runtime-extensions"),
-      this.renderDebugTargetPane("Tabs",
-                                 this.getIconByType(DEBUG_TARGETS.TAB),
-                                 tabs,
-                                 null,
-                                 InspectAction,
-                                 null,
-                                 TabDetail,
-                                 DEBUG_TARGET_PANE.TAB,
-                                 "about-debugging-runtime-tabs"),
       this.renderDebugTargetPane("Service Workers",
                                  this.getIconByType(DEBUG_TARGETS.WORKER),
                                  serviceWorkers,
                                  null,
                                  ServiceWorkerAction,
                                  ServiceWorkerAdditionalActions,
                                  WorkerDetail,
                                  DEBUG_TARGET_PANE.SERVICE_WORKER,
--- a/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_thisfirefox.js
+++ b/devtools/client/aboutdebugging-new/test/browser/browser_aboutdebugging_thisfirefox.js
@@ -1,17 +1,17 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 const EXPECTED_TARGET_PANES = [
+  "Tabs",
   "Temporary Extensions",
   "Extensions",
-  "Tabs",
   "Service Workers",
   "Shared Workers",
   "Other Workers",
 ];
 
 /**
  * Check that the This Firefox runtime page contains the expected categories if
  * the preference to enable local tab debugging is true.