Fix Baseline calculation when support was added then removed

Fixes web-platform-dx#876
ddbeck · Apr 15, 2024 · c6e092a · c6e092a
1 parent 1674f3a
commit c6e092a
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 5 deletions.
diff --git a/packages/compute-baseline/src/baseline/index.test.ts b/packages/compute-baseline/src/baseline/index.test.ts
@@ -76,17 +76,40 @@ describe("computeBaseline", function () {
   });
 
   it("finds discrepancies with ancestors (checkAncestors)", function () {
-    const compatKeys: [string, ...string[]] = ["api.Notification.body"];
-    const result = computeBaseline({ compatKeys, checkAncestors: false });
+    const result = computeBaseline({
+      compatKeys: ["api.Notification.body"],
+      checkAncestors: false,
+    });
+    const resultExplicit = computeBaseline({
+      compatKeys: ["api.Notification", "api.Notification.body"],
+      checkAncestors: false,
+    });
     const resultWithAncestors = computeBaseline({
-      compatKeys,
+      compatKeys: ["api.Notification.body"],
       checkAncestors: true,
     });
+
+    assert.equal(resultExplicit.toJSON(), resultWithAncestors.toJSON());
+    assert.notEqual(result.toJSON(), resultWithAncestors.toJSON());
+
     assert.notEqual(result.baseline, resultWithAncestors.baseline);
     assert.notEqual(
       result.baseline_low_date?.toString(),
       resultWithAncestors.baseline_low_date?.toString(),
     );
+
+    chai.expect(result).to.matchSnapshot();
+    chai.expect(resultExplicit).to.matchSnapshot();
+    chai.expect(resultWithAncestors).to.matchSnapshot();
+  });
+
+  it("disregards support that's been removed", function () {
+    const result = computeBaseline({
+      compatKeys: ["api.AudioTrack"],
+      checkAncestors: false,
+    });
+    chai.expect(result).to.matchSnapshot();
+    assert.notEqual(Boolean(result.baseline), true);
   });
 });
 

diff --git a/packages/compute-baseline/src/baseline/index.test.ts.snap b/packages/compute-baseline/src/baseline/index.test.ts.snap
@@ -1,5 +1,56 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`computeBaseline disregards support that's been removed 1`] = `
+"{
+  \\"baseline\\": false,
+  \\"support\\": {}
+}"
+`;
+
+exports[`computeBaseline finds discrepancies with ancestors (checkAncestors) 1`] = `
+"{
+  \\"baseline\\": \\"low\\",
+  \\"baseline_low_date\\": \\"2023-03-27\\",
+  \\"support\\": {
+    \\"chrome\\": \\"33\\",
+    \\"chrome_android\\": \\"42\\",
+    \\"edge\\": \\"14\\",
+    \\"firefox\\": \\"26\\",
+    \\"firefox_android\\": \\"26\\",
+    \\"safari\\": \\"11\\",
+    \\"safari_ios\\": \\"16.4\\"
+  }
+}"
+`;
+
+exports[`computeBaseline finds discrepancies with ancestors (checkAncestors) 2`] = `
+"{
+  \\"baseline\\": false,
+  \\"support\\": {
+    \\"chrome\\": \\"33\\",
+    \\"edge\\": \\"14\\",
+    \\"firefox\\": \\"26\\",
+    \\"firefox_android\\": \\"26\\",
+    \\"safari\\": \\"11\\",
+    \\"safari_ios\\": \\"16.4\\"
+  }
+}"
+`;
+
+exports[`computeBaseline finds discrepancies with ancestors (checkAncestors) 3`] = `
+"{
+  \\"baseline\\": false,
+  \\"support\\": {
+    \\"chrome\\": \\"33\\",
+    \\"edge\\": \\"14\\",
+    \\"firefox\\": \\"26\\",
+    \\"firefox_android\\": \\"26\\",
+    \\"safari\\": \\"11\\",
+    \\"safari_ios\\": \\"16.4\\"
+  }
+}"
+`;
+
 exports[`computeBaseline returns something sensible for the least complex features 1`] = `
 Object {
   "css.properties.counter-reset.reset_does_not_affect_siblings": "{

diff --git a/packages/compute-baseline/src/baseline/support.ts b/packages/compute-baseline/src/baseline/support.ts
@@ -24,9 +24,14 @@ export function support(feature: Feature, browsers: Browser[]): Support {
       }
     }
 
-    logReleaseOmissions(feature, qualifiedReleases, unqualifiedReleases);
+    const currentlySupported = unqualifiedReleases.includes(b.current());
+    if (currentlySupported) {
+      support.set(b, lastInitialRelease(unqualifiedReleases));
+    } else {
+      support.set(b, undefined);
+    }
 
-    support.set(b, lastInitialRelease(unqualifiedReleases));
+    logReleaseOmissions(feature, qualifiedReleases, unqualifiedReleases);
   }
 
   return support;