Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 16:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1651630 - Part 2: Hide the debug button instead of disabling it r=jdescottes,fluent-reviewers

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D83484
This commit is contained in:
Belén Albeza 2020-07-16 13:41:24 +00:00
parent 295e3aec7c
commit b6ccf2b611
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devtools/client/application/src/components/service-workers/Worker.js
View File

@ -125,17 +125,16 @@ class Worker extends PureComponent {
}
renderDebugButton() {
const { isDebugEnabled } = this.props;
// avoid rendering the debug button if service worker debugging is disabled
if (!this.props.isDebugEnabled) {
return null;
}
const isDisabled = !this.isRunning() || !isDebugEnabled;
const localizationId = isDebugEnabled
? "serviceworker-worker-debug"
: "serviceworker-worker-debug-forbidden";
const isDisabled = !this.isRunning();
return Localized(
{
id: localizationId,
id: "serviceworker-worker-debug",
// The localized title is only displayed if the debug link is disabled.
attrs: {
title: isDisabled,

12
devtools/client/application/test/node/components/service-workers/components_application_panel-Worker.test.js
View File

@ -58,6 +58,8 @@ describe("Worker", () => {
);
// check that Start button is available
expect(wrapper.find(".js-start-button")).toHaveLength(1);
// check that Debug button is disabled
expect(wrapper.find(".js-debug-button[disabled=true]")).toHaveLength(1);
expect(wrapper).toMatchSnapshot();
});
@ -98,11 +100,13 @@ describe("Worker", () => {
expect(wrapper.find(".js-worker-status").text()).toBe("installed");
// check that Start button is not available
expect(wrapper.find(".js-start-button")).toHaveLength(0);
// check that Debug button is disabled
expect(wrapper.find(".js-debug-button[disabled=true]")).toHaveLength(1);
expect(wrapper).toMatchSnapshot();
});
it("Enables/disabled the debug button depending of debugging being available", () => {
it("Shows/hides the debug button depending of debugging being available", () => {
const store = setupStore({});
// check disabled debugging
@ -113,8 +117,7 @@ describe("Worker", () => {
store,
})
).dive();
expect(wrapper.find(".js-debug-button[disabled=true]")).toHaveLength(1);
expect(wrapper.find(".js-debug-button")).toHaveLength(0);
// check enabled debugging
wrapper = shallow(
@ -124,7 +127,6 @@ describe("Worker", () => {
store,
})
).dive();
expect(wrapper.find(".js-debug-button[disabled=false]")).toHaveLength(1);
expect(wrapper.find(".js-debug-button")).toHaveLength(1);
});
});

5
devtools/client/locales/en-US/application.ftl
View File

@ -26,11 +26,6 @@ serviceworker-worker-unregister = Unregister
serviceworker-worker-debug = Debug
.title = Only running service workers can be debugged
# Text for the debug link displayed for an already started Service Worker, when we
# are in multi e10s mode, which effectively disables this link.
serviceworker-worker-debug-forbidden = Debug
.title = Can only debug service workers if multi e10s is disabled
# Text for the start link displayed for a registered but not running Service Worker.
# Clicking on the link will attempt to start the service worker.
serviceworker-worker-start3 = Start