Commit 206ddbe9 authored by arthur.iakab's avatar arthur.iakab
Browse files

Merge mozilla-central to mozilla-inbound

parents fd25889a 116bd975

browser/base/content/test/performance/browser.ini

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ skip-if = (verify && !debug && (os == 'win')) || (!debug && (os == 'win') && (bi 
[browser_tabswitch.js]

[browser_toolbariconcolor_restyles.js]

[browser_urlbar_keyed_search.js]

skip-if = (os == 'linux') || (os == 'win' && debug) || (os == 'win' && bits == 32) # Disabled on Linux and Windows debug due to perma failures. Bug 1392320. Disabled on Win32 because of intermittent OOM failures (bug 1448241).

skip-if = (os == 'win' && bits == 32) # Disabled on Win32 because of intermittent OOM failures (bug 1448241).

[browser_urlbar_search.js]

skip-if = (debug || ccov) && (os == 'linux' || os == 'win') || (os == 'win' && bits == 32) # Disabled on Linux and Windows debug and ccov due to intermittent timeouts. Bug 1414126, bug 1426611. Disabled on Win32 because of intermittent OOM failures (bug 1448241)

[browser_window_resize.js]

browser/components/sessionstore/test/browser.ini

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ skip-if = (os == 'win') # bug 1331853 
skip-if = (verify && debug)

[browser_formdata_cc.js]

[browser_formdata_format.js]

skip-if = !debug && (os == 'linux') # Bug 1535645

[browser_formdata_password.js]

support-files = file_formdata_password.html

[browser_formdata_xpath.js]

devtools/client/webconsole/components/message-types/ConsoleApiCall.js

+11 −1
Original line number Diff line number Diff line
@@ -93,8 +93,17 @@ function ConsoleApiCall(props) { 
        className: "console-message-prefix",

      }, `${prefix}: `));

    }

  } else {

  } else if (typeof messageText === "string") {

    messageBody = messageText;

  } else if (messageText) {

    messageBody = GripMessageBody({

      dispatch,

      messageId,

      grip: messageText,

      serviceContainer,

      useQuotes: false,

      type,

    });

  }



  let attachment = null;
@@ -140,6 +149,7 @@ function ConsoleApiCall(props) { 
    timeStamp,

    timestampsVisible,

    parameters,

    message,

    maybeScrollToBottom,

  });

}

devtools/client/webconsole/test/components/console-api-call.log-messages.test.js

+32 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ const { render } = require("enzyme"); 


// React

const { createFactory } = require("devtools/client/shared/vendor/react");

const { setupStore } = require("devtools/client/webconsole/test/helpers");

const Provider = createFactory(require("react-redux").Provider);



// Components under test.

const ConsoleApiCall = createFactory(require("devtools/client/webconsole/components/message-types/ConsoleApiCall"));
@@ -36,6 +38,19 @@ describe("ConsoleAPICall component:", () => { 
      // There should not be the location

      expect(wrapper.find(".message-location").text()).toBe("");

    });



    it("renders longString logMessage grips", () => {

      const message =

        prepareMessage(logMessageLongStringStubPacket, {getNextId: () => "1"});



      // We need to wrap the ConsoleApiElement in a Provider in order for the

      // ObjectInspector to work.

      const wrapper = render(

        Provider({ store: setupStore() }, ConsoleApiCall({ message, serviceContainer }))

      );



      expect(wrapper.find(".message-body").text()).toInclude(initialText);

    });

  });

});
@@ -53,3 +68,20 @@ const logMessageStubPacket = { 
  "message": "foobar test",

  "timeStamp": 1519052480060,

};



const multilineFullText = `a\n${Array(20000)

  .fill("a")

  .join("")}`;

const fullTextLength = multilineFullText.length;

const initialText = multilineFullText.substring(0, 10000);

const logMessageLongStringStubPacket = {

  "from": "server1.conn0.consoleActor2",

  "type": "logMessage",

  "message": {

    type: "longString",

    initial: initialText,

    length: fullTextLength,

    actor: "server1.conn1.child1/longString58",

  },

  "timeStamp": 1519052480060,

};

devtools/client/webconsole/test/fixtures/stubs/evaluationResult.js

+3 −89
Original line number Diff line number Diff line
@@ -106,51 +106,8 @@ stubPreparedMessages.set(`1 + @`, new ConsoleMessage({ 
      "type": "undefined"

    }

  ],

  "repeatId": "{\"frame\":{\"source\":\"debugger eval code\",\"line\":1,\"column\":4},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"SyntaxError: illegal character\",\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null,\"stacktrace\":[{\"filename\":\"resource://devtools/server/actors/webconsole/eval-with-debugger.js\",\"sourceId\":null,\"lineNumber\":134,\"columnNumber\":28,\"functionName\":\"getEvalResult\"},{\"filename\":\"resource://devtools/server/actors/webconsole/eval-with-debugger.js\",\"sourceId\":null,\"lineNumber\":105,\"columnNumber\":18,\"functionName\":\"exports.evalWithDebugger\"},{\"filename\":\"resource://devtools/server/actors/webconsole.js\",\"sourceId\":null,\"lineNumber\":1005,\"columnNumber\":22,\"functionName\":\"evaluateJS\"},{\"filename\":\"self-hosted\",\"sourceId\":null,\"lineNumber\":1005,\"columnNumber\":17,\"functionName\":\"evaluateJS\"},{\"filename\":\"resource://devtools/server/main.js\",\"sourceId\":null,\"lineNumber\":1291,\"columnNumber\":58,\"functionName\":\"onPacket\"},{\"filename\":\"resource://devtools/shared/transport/child-transport.js\",\"sourceId\":null,\"lineNumber\":66,\"columnNumber\":16,\"functionName\":\"receiveMessage\"}]}",

  "stacktrace": [

    {

      "filename": "resource://devtools/server/actors/webconsole/eval-with-debugger.js",

      "sourceId": null,

      "lineNumber": 134,

      "columnNumber": 28,

      "functionName": "getEvalResult"

    },

    {

      "filename": "resource://devtools/server/actors/webconsole/eval-with-debugger.js",

      "sourceId": null,

      "lineNumber": 105,

      "columnNumber": 18,

      "functionName": "exports.evalWithDebugger"

    },

    {

      "filename": "resource://devtools/server/actors/webconsole.js",

      "sourceId": null,

      "lineNumber": 1005,

      "columnNumber": 22,

      "functionName": "evaluateJS"

    },

    {

      "filename": "self-hosted",

      "sourceId": null,

      "lineNumber": 1005,

      "columnNumber": 17,

      "functionName": "evaluateJS"

    },

    {

      "filename": "resource://devtools/server/main.js",

      "sourceId": null,

      "lineNumber": 1291,

      "columnNumber": 58,

      "functionName": "onPacket"

    },

    {

      "filename": "resource://devtools/shared/transport/child-transport.js",

      "sourceId": null,

      "lineNumber": 66,

      "columnNumber": 16,

      "functionName": "receiveMessage"

    }

  ],

  "repeatId": "{\"frame\":{\"source\":\"debugger eval code\",\"line\":1,\"column\":4},\"groupId\":null,\"indent\":0,\"level\":\"error\",\"messageText\":\"SyntaxError: illegal character\",\"parameters\":[{\"type\":\"undefined\"}],\"source\":\"javascript\",\"type\":\"result\",\"userProvidedStyles\":null,\"stacktrace\":null}",

  "stacktrace": null,

  "frame": {

    "source": "debugger eval code",

    "line": 1,
@@ -490,50 +447,7 @@ stubPackets.set(`1 + @`, { 
  },

  "exceptionMessage": "SyntaxError: illegal character",

  "exceptionDocURL": "https://developer.mozilla.org/docs/Web/JavaScript/Reference/Errors/Illegal_character?utm_source=mozilla&utm_medium=firefox-console-errors&utm_campaign=default",

  "exceptionStack": [

    {

      "filename": "resource://devtools/server/actors/webconsole/eval-with-debugger.js",

      "sourceId": null,

      "lineNumber": 134,

      "columnNumber": 28,

      "functionName": "getEvalResult"

    },

    {

      "filename": "resource://devtools/server/actors/webconsole/eval-with-debugger.js",

      "sourceId": null,

      "lineNumber": 105,

      "columnNumber": 18,

      "functionName": "exports.evalWithDebugger"

    },

    {

      "filename": "resource://devtools/server/actors/webconsole.js",

      "sourceId": null,

      "lineNumber": 1005,

      "columnNumber": 22,

      "functionName": "evaluateJS"

    },

    {

      "filename": "self-hosted",

      "sourceId": null,

      "lineNumber": 1005,

      "columnNumber": 17,

      "functionName": "evaluateJS"

    },

    {

      "filename": "resource://devtools/server/main.js",

      "sourceId": null,

      "lineNumber": 1291,

      "columnNumber": 58,

      "functionName": "onPacket"

    },

    {

      "filename": "resource://devtools/shared/transport/child-transport.js",

      "sourceId": null,

      "lineNumber": 66,

      "columnNumber": 16,

      "functionName": "receiveMessage"

    }

  ],

  "exceptionStack": null,

  "errorMessageName": "JSMSG_ILLEGAL_CHARACTER",

  "frame": {

    "source": "debugger eval code",