Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 3 changesets (bug 1459279) for failures on stub-generators/browser_webconsole_check_stubs_console_api.js on a CLOSED TREE

Browse Source 
Backed out changeset 318ae5b0ec8b (bug 1459279)
Backed out changeset 11740609e1db (bug 1459279)
Backed out changeset 545a2ee68554 (bug 1459279)
This commit is contained in:
Gurzau Raul 2018-05-22 20:55:28 +03:00
parent 3af8f2bf35
commit 98fa42844c
5 changed files with 0 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devtools/client/locales/en-US/webconsole.properties
View File

@ -49,10 +49,6 @@ consoleCleared=Console was cleared.
# count-messages with no label provided.
noCounterLabel=<no label>
# LOCALIZATION NOTE (counterDoesntExist): this string is displayed when
# console.countReset() is called with a counter that doesn't exist.
counterDoesntExist=Counter “%S” doesn’t exist.
# LOCALIZATION NOTE (noGroupLabel): this string is used to display
# console.group messages with no label provided.
noGroupLabel=<no group label>

6
devtools/client/webconsole/test/components/console-api-call.test.js
View File

@ -202,12 +202,6 @@ describe("ConsoleAPICall component:", () => {
}, {
key: "console.count | test counter: 3",
expectedBodyText: "test counter: 3",
}, {
key: "console.countReset | test counter: 0",
expectedBodyText: "test counter: 0",
}, {
key: "console.countReset | counterDoesntExist",
expectedBodyText: "Counter “test counter” doesn't exist.",
}];
for (const {key, expectedBodyText} of messages) {

4
devtools/client/webconsole/test/fixtures/stub-generators/stub-snippets.js vendored
View File

@ -157,8 +157,6 @@ consoleApi.set("console.count", {
"console.count | clear",
"console.count | default: 4",
"console.count | test counter: 3",
"console.countReset | test counter: 0",
"console.countReset | counterDoesntExist",
],
code: `
console.count();
@ -169,8 +167,6 @@ consoleApi.set("console.count", {
console.clear();
console.count();
console.count("test counter");
console.countReset("test counter");
console.countReset("test counter");
`});
// CSS messages

216
devtools/client/webconsole/test/fixtures/stubs/consoleApi.js vendored
View File

@ -1621,110 +1621,6 @@ stubPreparedMessages.set(`console.count | test counter: 3`, new ConsoleMessage({
"private": false
}));
stubPreparedMessages.set(`console.countReset | test counter: 0`, new ConsoleMessage({
"id": "1",
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1526920412190,
"type": "log",
"helperType": null,
"level": "log",
"messageText": "test counter: 0",
"parameters": null,
"repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":10,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 0\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
"source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 10,
"column": 5
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
"prefix": "",
"private": false
}));
stubPreparedMessages.set(`console.countReset | counterDoesntExist`, new ConsoleMessage({
"id": "1",
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1526920412191,
"type": "log",
"helperType": null,
"level": "warn",
"messageText": "Counter “test counter” doesn't exist.",
"parameters": null,
"repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":11,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Counter “test counter” doesn't exist.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
"source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 11,
"column": 5
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
"prefix": "",
"private": false
}));
stubPreparedMessages.set(`console.countReset | test counter: 0`, new ConsoleMessage({
"id": "1",
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1526920412190,
"type": "log",
"helperType": null,
"level": "log",
"messageText": "test counter: 0",
"parameters": null,
"repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":10,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"log\",\"messageText\":\"test counter: 0\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
"source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 10,
"column": 5
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
"prefix": "",
"private": false
}));
stubPreparedMessages.set(`console.countReset | counterDoesntExist`, new ConsoleMessage({
"id": "1",
"allowRepeating": true,
"source": "console-api",
"timeStamp": 1526920412191,
"type": "log",
"helperType": null,
"level": "warn",
"messageText": "Counter “test counter” doesn't exist.",
"parameters": null,
"repeatId": "{\"frame\":{\"source\":\"http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html\",\"line\":11,\"column\":5},\"groupId\":null,\"indent\":0,\"level\":\"warn\",\"messageText\":\"Counter “test counter” doesn't exist.\",\"parameters\":null,\"source\":\"console-api\",\"type\":\"log\",\"userProvidedStyles\":[],\"private\":false}",
"stacktrace": null,
"frame": {
"source": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"line": 11,
"column": 5
},
"groupId": null,
"exceptionDocURL": null,
"userProvidedStyles": [],
"notes": null,
"indent": 0,
"prefix": "",
"private": false
}));
stubPackets.set(`console.log('foobar', 'test')`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "consoleAPICall",
@ -3242,118 +3138,6 @@ stubPackets.set(`console.count | test counter: 3`, {
}
});
stubPackets.set(`console.countReset | test counter: 0`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"test counter"
],
"columnNumber": 5,
"counter": {
"count": 0,
"label": "test counter"
},
"filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "countReset",
"lineNumber": 10,
"prefix": "",
"private": false,
"timeStamp": 1526920412190,
"timer": null,
"workerType": "none",
"styles": [],
"category": "webdev"
}
});
stubPackets.set(`console.countReset | counterDoesntExist`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"test counter"
],
"columnNumber": 5,
"counter": {
"error": "counterDoesntExist",
"label": "test counter"
},
"filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "countReset",
"lineNumber": 11,
"prefix": "",
"private": false,
"timeStamp": 1526920412191,
"timer": null,
"workerType": "none",
"styles": [],
"category": "webdev"
}
});
stubPackets.set(`console.countReset | test counter: 0`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"test counter"
],
"columnNumber": 5,
"counter": {
"count": 0,
"label": "test counter"
},
"filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "countReset",
"lineNumber": 10,
"prefix": "",
"private": false,
"timeStamp": 1526920412190,
"timer": null,
"workerType": "none",
"styles": [],
"category": "webdev"
}
});
stubPackets.set(`console.countReset | counterDoesntExist`, {
"from": "server1.conn0.child1/consoleActor2",
"type": "consoleAPICall",
"message": {
"addonId": "",
"arguments": [
"test counter"
],
"columnNumber": 5,
"counter": {
"error": "counterDoesntExist",
"label": "test counter"
},
"filename": "http://example.com/browser/devtools/client/webconsole/test/fixtures/stub-generators/test-console-api.html",
"functionName": "triggerPacket",
"groupName": "",
"level": "countReset",
"lineNumber": 11,
"prefix": "",
"private": false,
"timeStamp": 1526920412191,
"timer": null,
"workerType": "none",
"styles": [],
"category": "webdev"
}
});
module.exports = {
stubPreparedMessages,
stubPackets,

5
devtools/client/webconsole/utils/messages.js
View File

@ -83,7 +83,6 @@ function transformConsoleAPICallPacket(packet) {
parameters = [l10n.getStr("consoleCleared")];
break;
case "count":
case "countReset":
// Chrome RDP doesn't have a special type for count.
type = MESSAGE_TYPE.LOG;
let {counter} = message;
@ -91,10 +90,6 @@ function transformConsoleAPICallPacket(packet) {
if (!counter) {
// We don't show anything if we don't have counter data.
type = MESSAGE_TYPE.NULL_MESSAGE;
} else if (counter.error) {
messageText = l10n.getFormatStr(counter.error, [counter.label]);
level = MESSAGE_LEVEL.WARN;
parameters = null;
} else {
let label = counter.label ? counter.label : l10n.getStr("noCounterLabel");
messageText = `${label}: ${counter.count}`;