Bug 1398727 - Fix missing tab title on devtools.panels.elements.creat…

…eSidebarPane tabs. r=gl MozReview-Commit-ID: G5F9uEC6izs --HG-- extra : rebase_source : 1e34ddf1d2ee4fe5db7886d824c4279ffcbc7674
mozilla · Sep 9, 2017 · 86c4053 · 86c4053
1 parent 00681c0
commit 86c4053
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/browser/components/extensions/test/browser/browser_ext_devtools_panels_elements_sidebar.js b/browser/components/extensions/test/browser/browser_ext_devtools_panels_elements_sidebar.js
@@ -7,6 +7,11 @@ XPCOMUtils.defineLazyModuleGetter(this, "gDevTools",
 XPCOMUtils.defineLazyModuleGetter(this, "devtools",
                                   "resource://devtools/shared/Loader.jsm");
 
+function isActiveSidebarTabTitle(inspector, expectedTabTitle, message) {
+  const actualTabTitle = inspector.panelDoc.querySelector(".tabs-menu-item.is-active").innerText;
+  is(actualTabTitle, expectedTabTitle, message);
+}
+
 add_task(async function test_devtools_panels_elements_sidebar() {
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, "http://mochi.test:8888/");
 
@@ -70,6 +75,9 @@ add_task(async function test_devtools_panels_elements_sidebar() {
 
   is(shownSidebarInstance, "sidebar1", "Got the shown event on the first extension sidebar");
 
+  isActiveSidebarTabTitle(inspector, "Test Sidebar 1",
+                          "Got the expected title on the active sidebar tab");
+
   const sidebarPanel1 = inspector.sidebar.getTabPanel(sidebarIds[0]);
 
   ok(sidebarPanel1, "Got a rendered sidebar panel for the first registered extension sidebar");
@@ -94,6 +102,9 @@ add_task(async function test_devtools_panels_elements_sidebar() {
   is(shownSidebarInstance2, "sidebar2", "Got the shown event on the second extension sidebar");
   is(hiddenSidebarInstance1, "sidebar1", "Got the hidden event on the first extension sidebar");
 
+  isActiveSidebarTabTitle(inspector, "Test Sidebar 2",
+                          "Got the expected title on the active sidebar tab");
+
   const sidebarPanel2 = inspector.sidebar.getTabPanel(sidebarIds[1]);
 
   ok(sidebarPanel2, "Got a rendered sidebar panel for the second registered extension sidebar");

diff --git a/devtools/client/inspector/extensions/extension-sidebar.js b/devtools/client/inspector/extensions/extension-sidebar.js
@@ -52,6 +52,7 @@ class ExtensionSidebar {
       this._provider = createElement(Provider, {
         store: this.store,
         key: this.id,
+        title: this.title,
       }, ExtensionSidebarComponent({
         id: this.id,
       }));

diff --git a/devtools/client/inspector/extensions/test/browser_inspector_extension_sidebar.js b/devtools/client/inspector/extensions/test/browser_inspector_extension_sidebar.js
@@ -22,6 +22,8 @@ add_task(async function () {
 
   is(sidebar.title, sidebarTitle,
      "Got the expected title in the extension sidebar instance");
+  is(sidebar.provider.props.title, sidebarTitle,
+     "Got the expeted title in the provider props");
 
   let inspectorStoreState = inspector.store.getState();