Clicking a link in HtmlReporterV2 does exact filtering

spec/html/HtmlReporterV2Spec.js

@@ -349,6 +349,7 @@ describe('HtmlReporterV2', function() {
 
       let specResult = {
         id: 123,
+        parentSuiteId: 1,
         description: 'with a spec',
         fullName: 'A Suite with a spec',
         status: 'passed',
@@ -423,7 +424,9 @@ describe('HtmlReporterV2', function() {
       const suiteDetail = outerSuite.childNodes[0];
       const suiteLink = suiteDetail.childNodes[0];
       expect(suiteLink.innerHTML).toEqual('A Suite');
-      expect(suiteLink.getAttribute('href')).toEqual('/?spec=A%20Suite');
+      expect(suiteLink.getAttribute('href')).toEqual(
+        `/?path=${encodeURIComponent('["A Suite"]')}`
+      );
 
       const specs = outerSuite.childNodes[1];
       const spec = specs.childNodes[0];
@@ -433,7 +436,7 @@ describe('HtmlReporterV2', function() {
       const specLink = spec.childNodes[0];
       expect(specLink.innerHTML).toEqual('with a spec');
       expect(specLink.getAttribute('href')).toEqual(
-        '/?spec=A%20Suite%20with%20a%20spec'
+        `/?path=${encodeURIComponent('["A Suite","with a spec"]')}`
       );
 
       const specDuration = spec.childNodes[1];
@@ -779,7 +782,7 @@ describe('HtmlReporterV2', function() {
         reporter.jasmineDone({ order: { random: true } });
 
         const skippedLink = container.querySelector('.jasmine-skipped a');
-        expect(skippedLink.getAttribute('href')).toEqual('/?spec=');
+        expect(skippedLink.getAttribute('href')).toEqual('/?path=');
       });
     });
 
@@ -985,6 +988,7 @@ describe('HtmlReporterV2', function() {
 
         const failingSpecResult = {
           id: 124,
+          parentSuiteId: 2,
           status: 'failed',
           description: 'a failing spec',
           fullName: 'a suite inner suite a failing spec',
@@ -1106,16 +1110,20 @@ describe('HtmlReporterV2', function() {
         expect(links.length).toEqual(3);
         expect(links[0].textContent).toEqual('A suite');
 
-        expect(links[0].getAttribute('href')).toMatch(/\?spec=A%20suite/);
+        expect(links[0].getAttribute('href')).toEqual(
+          `/?path=${encodeURIComponent('["A suite"]')}`
+        );
 
         expect(links[1].textContent).toEqual('inner suite');
-        expect(links[1].getAttribute('href')).toMatch(
-          /\?spec=A%20suite%20inner%20suite/
+        expect(links[1].getAttribute('href')).toEqual(
+          `/?path=${encodeURIComponent('["A suite","inner suite"]')}`
         );
 
         expect(links[2].textContent).toEqual('a failing spec');
-        expect(links[2].getAttribute('href')).toMatch(
-          /\?spec=a%20suite%20inner%20suite%20a%20failing%20spec/
+        expect(links[2].getAttribute('href')).toEqual(
+          `/?path=${encodeURIComponent(
+            '["A suite","inner suite","a failing spec"]'
+          )}`
         );
       });
 

spec/html/HtmlReporterV2UrlsSpec.js

@@ -10,17 +10,17 @@ describe('HtmlReporterV2Urls', function() {
 
     it('configures a matching spec filter', function() {
       const queryString = mockQueryString();
-      queryString.getParam.withArgs('spec').and.returnValue('foo');
+      queryString.getParam.withArgs('path').and.returnValue('["foo","bar"]');
       const subject = new jasmineUnderTest.HtmlReporterV2Urls({ queryString });
       const config = subject.configFromCurrentUrl();
       const matching = {
-        getFullName() {
-          return 'foobar';
+        getPath() {
+          return ['foo', 'bar'];
         }
       };
       const nonMatching = {
-        getFullName() {
-          return 'baz';
+        getPath() {
+          return ['foobar'];
         }
       };
       expect(config.specFilter(matching)).toEqual(true);

spec/html/HtmlSpecFilterV2Spec.js

@@ -1,19 +1,49 @@
 describe('HtmlSpecFilterV2', function() {
-  it('should match when no string is provided', function() {
-    const specFilter = new privateUnderTest.HtmlSpecFilterV2();
-
-    expect(specFilter.matches('foo')).toBe(true);
-    expect(specFilter.matches('*bar')).toBe(true);
-  });
-
-  it('should only match the provided string', function() {
+  it('matches everything when no string is provided', function() {
     const specFilter = new privateUnderTest.HtmlSpecFilterV2({
-      filterString: function() {
-        return 'foo';
+      filterString() {
+        return '';
       }
     });
 
-    expect(specFilter.matches('foo')).toBe(true);
-    expect(specFilter.matches('bar')).toBe(false);
+    expect(specFilter.matches({})).toBeTrue();
   });
+
+  it('matches a spec with the exact same path', function() {
+    const specFilter = new privateUnderTest.HtmlSpecFilterV2({
+      filterString() {
+        return '["a","b","c"]';
+      }
+    });
+
+    expect(specFilter.matches(stubSpec(['a', 'b', 'c']))).toBeTrue();
+  });
+
+  it('matches a spec whose path has the filter path as a prefix', function() {
+    const specFilter = new privateUnderTest.HtmlSpecFilterV2({
+      filterString() {
+        return '["a","b"]';
+      }
+    });
+
+    expect(specFilter.matches(stubSpec(['a', 'b', 'c']))).toBeTrue();
+  });
+
+  it('does not match a spec with a different path', function() {
+    const specFilter = new privateUnderTest.HtmlSpecFilterV2({
+      filterString() {
+        return '["a","b","c"]';
+      }
+    });
+
+    expect(specFilter.matches(stubSpec(['a', 'd', 'c']))).toBeFalse();
+  });
+
+  function stubSpec(path) {
+    return {
+      getPath() {
+        return path;
+      }
+    };
+  }
 });