Merge pull request #27 from mukilan/fix-NaN-scores-due-to-subtest-name

Use `Object.hasOwn` to handle subtests with names like `toString`
servo · Jul 31, 2024 · d7a48a5 · d7a48a5
2 parents 5093f00 + 7fbfa98
commit d7a48a5
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/process-wpt-results.js b/process-wpt-results.js
@@ -193,7 +193,7 @@ export function score_run (run, against_run, focus_areas_map) {
         } else {
             let test_score = 0
             for (const subtest of subtest_names) {
-                if (run_test.subtests[subtest]) {
+                if (Object.hasOwn(run_test.subtests, subtest)) {
                     test_score += run_test.subtests[subtest].score
                 }
             }

diff --git a/test/process-wpt-results.test.js b/test/process-wpt-results.test.js
@@ -206,6 +206,39 @@ describe('Scoring', () => {
         const score = score_run(run, run, { test1: ['all'] })
         assert.equal(score.all, 333)
     })
+    it('calculates scores correctly even subtest name collides with JS builtins', () => {
+        const run = {
+            test_scores: {
+                test1: {
+                    score: 0,
+                    subtests: {
+                    }
+                },
+                test2: {
+                    score: 1,
+                    subtests: { }
+                }
+            }
+        }
+
+        const against_run = {
+            test_scores: {
+                test1: {
+                    score: 1,
+                    subtests: {
+                        toString: { score: 1 }
+                    }
+                },
+                test2: {
+                    score: 1,
+                    subtests: { }
+                }
+            }
+        }
+
+        const score = score_run(run, against_run, { test1: ['all'], test2: ['all'] })
+        assert.equal(score.all, 500)
+    })
     it('calculates scores based only on tests in new runs', () => {
         const old_run = {
             test_scores: {