Verified Commit be05d7b9 authored by Hubert Boma Manilla's avatar Hubert Boma Manilla Committed by Pier Angelo Vendrame
Browse files

Bug 1790542 - [devtools] Convert browser_source_map-reload.js test from using... 

Bug 1790542 - [devtools] Convert browser_source_map-reload.js test from using .sjs files to createTestHTTPServer r=ochameau,devtools-reviewers

.sjs files depend on redirects to load static files.
In D168648 we block redirects on sourceMappingUrl, so this browser_source_map-reload.js
fails because we use .sjs to serve the content.

This patch refactors to no longer use .sjs files

Differential Revision: https://phabricator.services.mozilla.com/D169739
parent 3623bd82

devtools/client/debugger/test/mochitest/shared-head.js

+0 −80
Original line number Diff line number Diff line
@@ -2309,86 +2309,6 @@ async function setLogPoint(dbg, index, value) { 
  await onBreakpointSet;

}



/**

 * Instantiate a HTTP Server that serves files from a given test folder.

 * The test folder should be made of multiple sub folder named: v1, v2, v3,...

 * We will serve the content from one of these sub folder

 * and switch to the next one, each time `httpServer.switchToNextVersion()`

 * is called.

 *

 * @return Object Test server with two functions:

 *   - urlFor(path)

 *     Returns the absolute url for a given file.

 *   - switchToNextVersion()

 *     Start serving files from the next available sub folder.

 *   - backToFirstVersion()

 *     When running more than one test, helps restart from the first folder.

 */

function createVersionizedHttpTestServer(testFolderName) {

  const httpServer = createTestHTTPServer();



  let currentVersion = 1;



  httpServer.registerPrefixHandler("/", async (request, response) => {

    response.processAsync();

    response.setStatusLine(request.httpVersion, 200, "OK");

    if (request.path.endsWith(".js")) {

      response.setHeader("Content-Type", "application/javascript");

    } else if (request.path.endsWith(".js.map")) {

      response.setHeader("Content-Type", "application/json");

    }

    if (request.path == "/" || request.path == "/index.html") {

      response.setHeader("Content-Type", "text/html");

    }

    // If a query string is passed, lookup with a matching file, if available

    // The '?' is replaced by '.'

    let fetchResponse;

    if (request.queryString) {

      const url = `${URL_ROOT}${testFolderName}/v${currentVersion}${request.path}.${request.queryString}`;

      try {

        fetchResponse = await fetch(url);

        // Log this only if the request succeed

        info(`[test-http-server] serving: ${url}`);

      } catch (e) {

        // Ignore any error and proceed without the query string

        fetchResponse = null;

      }

    }

    if (!fetchResponse) {

      const url = `${URL_ROOT}${testFolderName}/v${currentVersion}${request.path}`;

      info(`[test-http-server] serving: ${url}`);

      fetchResponse = await fetch(url);

    }



    // Ensure forwarding the response headers generated by the other http server

    // (this can be especially useful when query .sjs files)

    for (const [name, value] of fetchResponse.headers.entries()) {

      response.setHeader(name, value);

    }



    // Override cache settings so that versionized requests are never cached

    // and we get brand new content for any request.

    response.setHeader("Cache-Control", "no-store");



    const text = await fetchResponse.text();

    response.write(text);

    response.finish();

  });



  return {

    switchToNextVersion() {

      currentVersion++;

    },

    backToFirstVersion() {

      currentVersion = 1;

    },

    urlFor(path) {

      const port = httpServer.identity.primaryPort;

      return `http://localhost:${port}/${path}`;

    },

  };

}



// This module is also loaded for Browser Toolbox tests, within the browser toolbox process

// which doesn't contain mochitests resource://testing-common URL.

// This isn't important to allow rejections in the context of the browser toolbox tests.

devtools/client/framework/test/browser.ini

+1 −9
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
tags = devtools

subsuite = devtools

support-files =

  reload/*

  browser_toolbox_options_disable_js.html

  browser_toolbox_options_disable_js_iframe.html

  browser_toolbox_options_disable_cache.sjs
@@ -19,23 +20,16 @@ support-files = 
  code_bundle_cross_domain.js.map

  code_bundle_no_race.js

  code_bundle_no_race.js.map

  code_bundle_reload_1.js

  code_bundle_reload_1.js.map

  code_bundle_reload_2.js

  code_bundle_reload_2.js.map

  code_cross_domain.js

  code_inline_bundle.js

  code_inline_original.js

  code_math.js

  code_no_race.js

  code_reload_1.js

  code_reload_2.js

  doc_backward_forward_navigation.html

  doc_cached-resource.html

  doc_cached-resource_iframe.html

  doc_empty-tab-01.html

  doc_lazy_tool.html

  doc_reload.html

  doc_textbox_tool.html

  head.js

  helper_disable_cache.js
@@ -45,8 +39,6 @@ support-files = 
  browser_toolbox_options_enable_serviceworkers_testing.html

  serviceworker.js

  sjs_cache_controle_header.sjs

  sjs_code_reload.sjs

  sjs_code_bundle_reload_map.sjs

  test_chrome_page.html

  !/devtools/client/debugger/test/mochitest/shared-head.js

  !/devtools/client/inspector/test/shared-head.js

devtools/client/framework/test/browser_source_map-reload.js

+13 −9
Original line number Diff line number Diff line
@@ -4,16 +4,18 @@ 
// Test that reloading re-reads the source maps.



"use strict";

const INITIAL_URL =

  "data:text/html,<!doctype html>html><head><meta charset='utf-8'/><title>Empty test page 1</title></head><body></body></html>";

const ORIGINAL_URL_1 = "webpack://code-reload/v1/code_reload_1.js";

const ORIGINAL_URL_2 = "webpack://code-reload/v2/code_reload_2.js";



const INITIAL_URL = URL_ROOT_SSL + "doc_empty-tab-01.html";

const PAGE_URL = URL_ROOT_SSL + "doc_reload.html";

const JS_URL = URL_ROOT_SSL + "sjs_code_reload.sjs";

const GENERATED_LINE = 13;

const ORIGINAL_LINE = 7;



const ORIGINAL_URL_1 = "webpack:///code_reload_1.js";

const ORIGINAL_URL_2 = "webpack:///code_reload_2.js";

const testServer = createVersionizedHttpTestServer("reload");



const GENERATED_LINE = 86;

const ORIGINAL_LINE = 13;

const PAGE_URL = testServer.urlFor("doc_reload.html");

const JS_URL = testServer.urlFor("code_bundle_reload.js");



add_task(async function() {

  // Start with the empty page, then navigate, so that we can properly
@@ -29,11 +31,13 @@ add_task(async function() { 
  let newLoc = await new Promise(r =>

    service.subscribeByURL(JS_URL, GENERATED_LINE, undefined, r)

  );



  is(newLoc.url, ORIGINAL_URL_1, "check mapped URL");

  is(newLoc.line, ORIGINAL_LINE, "check mapped line number");



  // Reload the page.  The sjs ensures that a different source file

  // will be loaded.

  testServer.switchToNextVersion();



  // Reload the page. A different source file will be loaded.

  sourceSeen = waitForSourceLoad(toolbox, JS_URL);

  await reloadBrowser();

  await sourceSeen;

devtools/client/framework/test/code_bundle_reload_1.js

deleted100644 → 0
+0 −94
Original line number Diff line number Diff line 
/******/ (function(modules) { // webpackBootstrap

/******/ 	// The module cache

/******/ 	var installedModules = {};

/******/

/******/ 	// The require function

/******/ 	function __webpack_require__(moduleId) {

/******/

/******/ 		// Check if module is in cache

/******/ 		if(installedModules[moduleId]) {

/******/ 			return installedModules[moduleId].exports;

/******/ 		}

/******/ 		// Create a new module (and put it into the cache)

/******/ 		var module = installedModules[moduleId] = {

/******/ 			i: moduleId,

/******/ 			l: false,

/******/ 			exports: {}

/******/ 		};

/******/

/******/ 		// Execute the module function

/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);

/******/

/******/ 		// Flag the module as loaded

/******/ 		module.l = true;

/******/

/******/ 		// Return the exports of the module

/******/ 		return module.exports;

/******/ 	}

/******/

/******/

/******/ 	// expose the modules object (__webpack_modules__)

/******/ 	__webpack_require__.m = modules;

/******/

/******/ 	// expose the module cache

/******/ 	__webpack_require__.c = installedModules;

/******/

/******/ 	// identity function for calling harmony imports with the correct context

/******/ 	__webpack_require__.i = function(value) { return value; };

/******/

/******/ 	// define getter function for harmony exports

/******/ 	__webpack_require__.d = function(exports, name, getter) {

/******/ 		if(!__webpack_require__.o(exports, name)) {

/******/ 			Object.defineProperty(exports, name, {

/******/ 				configurable: false,

/******/ 				enumerable: true,

/******/ 				get: getter

/******/ 			});

/******/ 		}

/******/ 	};

/******/

/******/ 	// getDefaultExport function for compatibility with non-harmony modules

/******/ 	__webpack_require__.n = function(module) {

/******/ 		var getter = module && module.__esModule ?

/******/ 			function getDefault() { return module['default']; } :

/******/ 			function getModuleExports() { return module; };

/******/ 		__webpack_require__.d(getter, 'a', getter);

/******/ 		return getter;

/******/ 	};

/******/

/******/ 	// Object.prototype.hasOwnProperty.call

/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };

/******/

/******/ 	// __webpack_public_path__

/******/ 	__webpack_require__.p = "";

/******/

/******/ 	// Load entry module and return exports

/******/ 	return __webpack_require__(__webpack_require__.s = 0);

/******/ })

/************************************************************************/

/******/ ([

/* 0 */

/***/ (function(module, exports, __webpack_require__) {



"use strict";

/* Any copyright is dedicated to the Public Domain.

 http://creativecommons.org/publicdomain/zero/1.0/ */



// Original source code for the inline source map test.

// The generated file was made with

//    webpack --devtool source-map code_reload_1.js code_bundle_reload_1.js

//    perl -pi -e 's/sjs_code_bundle_reload_map.sjs/sjs_code_bundle_reload_map.sjs/' \

//         code_bundle_reload_1.js







function f() {

  console.log("The first version of the script");

}



f();





/***/ })

/******/ ]);

//# sourceMappingURL=sjs_code_bundle_reload_map.sjs
 
 No newline at end of file

devtools/client/framework/test/code_bundle_reload_1.js.map

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
{"version":3,"sources":["webpack:///webpack/bootstrap 59857d9393d4518a63ff","webpack:///./code_reload_1.js"],"names":[],"mappings":";AAAA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;;AAEA;AACA;;AAEA;AACA;AACA;;;AAGA;AACA;;AAEA;AACA;;AAEA;AACA,mDAA2C,cAAc;;AAEzD;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aAAK;AACL;AACA;;AAEA;AACA;AACA;AACA,mCAA2B,0BAA0B,EAAE;AACvD,yCAAiC,eAAe;AAChD;AACA;AACA;;AAEA;AACA,8DAAsD,+DAA+D;;AAErH;AACA;;AAEA;AACA;;;;;;;;AChEA;AACA;;AAEA;AACA;AACA;AACA;AACA;;AAEA;;AAEA;AACA;AACA;;AAEA","file":"code_bundle_reload_1.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// identity function for calling harmony imports with the correct context\n \t__webpack_require__.i = function(value) { return value; };\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 0);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 59857d9393d4518a63ff","/* Any copyright is dedicated to the Public Domain.\n http://creativecommons.org/publicdomain/zero/1.0/ */\n\n// Original source code for the inline source map test.\n// The generated file was made with\n//    webpack --devtool source-map code_reload_1.js code_bundle_reload_1.js\n//    perl -pi -e 's/code_bundle_reload_1.js.map/sjs_code_bundle_reload_map.sjs/' \\\n//         code_bundle_reload_1.js\n\n\"use strict\";\n\nfunction f() {\n  console.log(\"The first version of the script\");\n}\n\nf();\n\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./code_reload_1.js\n// module id = 0\n// module chunks = 0"],"sourceRoot":""}
 
 No newline at end of file