Merge branch 'main' into 5.99

src/boot/boot1.js

@@ -14,12 +14,20 @@
 (function() {
   const env = jasmine.getEnv();
 
+  /**
+   * ## Runner Parameters
+   *
+   * More browser specific code - wrap the query string in an object and to allow for getting/setting parameters from the runner user interface.
+   */
+
   const queryString = new jasmine.QueryString({
     getWindowLocation: function() {
       return window.location;
     }
   });
 
+  const filterSpecs = !!queryString.getParam('spec');
+
   const config = {
     stopOnSpecFailure: queryString.getParam('stopOnSpecFailure'),
     stopSpecOnExpectationFailure: queryString.getParam(
@@ -61,7 +69,7 @@
       return document.createTextNode.apply(document, arguments);
     },
     timer: new jasmine.Timer(),
-    queryString
+    filterSpecs: filterSpecs
   });
 
   /**
@@ -73,9 +81,14 @@
   /**
    * Filter which specs will be run by matching the start of the full name against the `spec` query param.
    */
-  const specFilter = new jasmine.HtmlExactSpecFilter({ queryString });
+  const specFilter = new jasmine.HtmlSpecFilter({
+    filterString: function() {
+      return queryString.getParam('spec');
+    }
+  });
+
   config.specFilter = function(spec) {
-    return specFilter.matches(spec);
+    return specFilter.matches(spec.getFullName());
   };
 
   env.configure(config);

src/html/HtmlExactSpecFilter.js

@@ -1,52 +0,0 @@
-jasmineRequire.HtmlExactSpecFilter = function() {
-  /**
-   * Spec filter for use with {@link HtmlReporter}
-   *
-   * See lib/jasmine-core/boot1.js for usage.
-   * @since 5.11.0
-   */
-  class HtmlExactSpecFilter {
-    #getFilterString;
-
-    /**
-     * Create a filter instance.
-     * @param options Object with a queryString property, which should be an
-     * instance of {@link QueryString}.
-     */
-    constructor(options) {
-      this.#getFilterString = function() {
-        return options.queryString.getParam('spec');
-      };
-    }
-
-    /**
-     * Determines whether the specified spec should be executed.
-     * @param {Spec} spec
-     * @returns {boolean}
-     */
-    matches(spec) {
-      const filterString = this.#getFilterString();
-
-      if (!filterString) {
-        return true;
-      }
-
-      const filterPath = JSON.parse(this.#getFilterString());
-      const specPath = spec.getPath();
-
-      if (filterPath.length > specPath.length) {
-        return false;
-      }
-
-      for (let i = 0; i < filterPath.length; i++) {
-        if (specPath[i] !== filterPath[i]) {
-          return false;
-        }
-      }
-
-      return true;
-    }
-  }
-
-  return HtmlExactSpecFilter;
-};

src/html/HtmlReporter.js

@@ -5,13 +5,11 @@ jasmineRequire.HtmlReporter = function(j$) {
     this.specsExecuted = 0;
     this.failureCount = 0;
     this.pendingSpecCount = 0;
-    this.suitesById = [];
   }
 
   ResultsStateBuilder.prototype.suiteStarted = function(result) {
     this.currentParent.addChild(result, 'suite');
     this.currentParent = this.currentParent.last();
-    this.suitesById[result.id] = this.currentParent;
   };
 
   ResultsStateBuilder.prototype.suiteDone = function(result) {
@@ -64,14 +62,10 @@ jasmineRequire.HtmlReporter = function(j$) {
     const getContainer = options.getContainer;
     const createElement = options.createElement;
     const createTextNode = options.createTextNode;
-    // TODO: in the next major release, replace navigateWithNewParam and
-    // addToExistingQueryString with direct usage of options.queryString
     const navigateWithNewParam = options.navigateWithNewParam || function() {};
     const addToExistingQueryString =
       options.addToExistingQueryString || defaultQueryString;
-    const filterSpecs = options.queryString
-      ? !!options.queryString.getParam('spec')
-      : options.filterSpecs; // For compatibility with pre-5.11 boot files
+    const filterSpecs = options.filterSpecs;
     let htmlReporterMain;
     let symbols;
     const deprecationWarnings = [];
@@ -700,6 +694,21 @@ jasmineRequire.HtmlReporter = function(j$) {
       return wrapper;
     }
 
+    function suiteHref(suite) {
+      const els = [];
+
+      while (suite && suite.parent) {
+        els.unshift(suite.result.description);
+        suite = suite.parent;
+      }
+
+      // include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906
+      return (
+        (window.location.pathname || '') +
+        addToExistingQueryString('spec', els.join(' '))
+      );
+    }
+
     function addDeprecationWarnings(result, runnableType) {
       if (result && result.deprecationWarnings) {
         for (let i = 0; i < result.deprecationWarnings.length; i++) {
@@ -797,33 +806,11 @@ jasmineRequire.HtmlReporter = function(j$) {
       return '' + count + ' ' + word;
     }
 
-    function suitePath(suite) {
-      const els = [];
-
-      while (suite && suite.parent) {
-        els.unshift(suite.result.description);
-        suite = suite.parent;
-      }
-
-      return els;
-    }
-
-    function suiteHref(suite) {
-      return pathHref(suitePath(suite));
-    }
-
     function specHref(result) {
-      const suite = stateBuilder.suitesById[result.parentSuiteId];
-      const path = suitePath(suite);
-      path.push(result.description);
-      return pathHref(path);
-    }
-
-    function pathHref(path) {
       // include window.location.pathname to fix issue with karma-jasmine-html-reporter in angular: see https://github.com/jasmine/jasmine/issues/1906
       return (
         (window.location.pathname || '') +
-        addToExistingQueryString('spec', JSON.stringify(path))
+        addToExistingQueryString('spec', result.fullName)
       );
     }
 

src/html/HtmlSpecFilter.js

@@ -1,25 +1,11 @@
 jasmineRequire.HtmlSpecFilter = function() {
-  /**
-   * @name HtmlSpecFilter
-   * @classdesc Legacy HTML spec filter, for backward compatibility
-   * with boot files that predate {@link HtmlExactSpecFilter}.
-   * @param options Object with a filterString method
-   * @constructor
-   * @deprecated
-   * @since 1.2.0
-   */
   // Legacy HTML spec filter, preserved for backward compatibility with
   // boot files that predate HtmlExactSpecFilterV2
   function HtmlSpecFilter(options) {
-    let filterString = (options && options.filterString()) || '';
-
-    if (filterString.startsWith('[')) {
-      // Convert an HtmlExactSpecFilterV2 string into something we can use
-      filterString = JSON.parse(filterString).join(' ');
-    }
-
-    filterString = filterString.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
-
+    const filterString =
+      options &&
+      options.filterString() &&
+      options.filterString().replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
     const filterPattern = new RegExp(filterString);
 
     /**

src/html/requireHtml.js

@@ -6,5 +6,4 @@ jasmineRequire.html = function(j$) {
   j$.HtmlReporter = jasmineRequire.HtmlReporter(j$);
   j$.QueryString = jasmineRequire.QueryString();
   j$.HtmlSpecFilter = jasmineRequire.HtmlSpecFilter();
-  j$.HtmlExactSpecFilter = jasmineRequire.HtmlExactSpecFilter();
 };