From 819f7b4966e9b38912b205ce535bc9a5270d4bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bargull?= <andre.bargull@gmail.com>
Date: Wed, 30 Apr 2025 14:16:17 +0200
Subject: [PATCH] Address fixme notes in test files

---
 test/staging/sm/Array/unscopables.js         |  2 --
 test/staging/sm/class/className.js           | 12 ++++------
 test/staging/sm/destructuring/order-super.js | 24 +++++++++++++++-----
 test/staging/sm/destructuring/order.js       | 24 +++++++++++++++-----
 test/staging/sm/generators/iteration.js      | 13 -----------
 5 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/test/staging/sm/Array/unscopables.js b/test/staging/sm/Array/unscopables.js
index 7c71f0d636..2b81fe94a4 100644
--- a/test/staging/sm/Array/unscopables.js
+++ b/test/staging/sm/Array/unscopables.js
@@ -33,8 +33,6 @@ verifyProperty(Array_unscopables, "values", {
 
 let keys = Reflect.ownKeys(Array_unscopables);
 
-// FIXME: Once bug 1826643 is fixed, change this test so that all
-// the keys are in alphabetical order
 let expectedKeys = [
     "at",
     "copyWithin",
diff --git a/test/staging/sm/class/className.js b/test/staging/sm/class/className.js
index 357de5cc3c..09fec3d0a6 100644
--- a/test/staging/sm/class/className.js
+++ b/test/staging/sm/class/className.js
@@ -28,9 +28,7 @@ function testName(C, name, hasValue, hasGetter, hasSetter, isFunction=false) {
         } else {
             assert.sameValue(desc.value, name);
         }
-        // FIXME: Methods defined in classes should not be enumerable
-        // (bug 1144630).
-        // assert.sameValue(desc.enumerable, false);
+        assert.sameValue(desc.enumerable, false);
         assert.sameValue(desc.configurable, true);
 
         assert.sameValue("get" in desc, false);
@@ -44,24 +42,24 @@ function testName(C, name, hasValue, hasGetter, hasSetter, isFunction=false) {
     if (hasGetter) {
         assert.sameValue("get" in desc, true);
         assert.sameValue(desc.get(), name);
-        // assert.sameValue(desc.enumerable, false);
+        assert.sameValue(desc.enumerable, false);
         assert.sameValue(desc.configurable, true);
     } else {
         assert.sameValue("get" in desc, true);
         assert.sameValue(desc.get, undefined);
-        // assert.sameValue(desc.enumerable, false);
+        assert.sameValue(desc.enumerable, false);
         assert.sameValue(desc.configurable, true);
     }
 
     if (hasSetter) {
         assert.sameValue("set" in desc, true);
         assert.sameValue(typeof desc.set, "function");
-        // assert.sameValue(desc.enumerable, false);
+        assert.sameValue(desc.enumerable, false);
         assert.sameValue(desc.configurable, true);
     } else {
         assert.sameValue("set" in desc, true);
         assert.sameValue(desc.set, undefined);
-        // assert.sameValue(desc.enumerable, false);
+        assert.sameValue(desc.enumerable, false);
         assert.sameValue(desc.configurable, true);
     }
 }
diff --git a/test/staging/sm/destructuring/order-super.js b/test/staging/sm/destructuring/order-super.js
index 6c2fb12055..e286b90a69 100644
--- a/test/staging/sm/destructuring/order-super.js
+++ b/test/staging/sm/destructuring/order-super.js
@@ -28,12 +28,6 @@ function ToString(name) {
 function logger(obj, prefix=[]) {
   let wrapped = new Proxy(obj, {
     get(that, name) {
-      if (name == "return") {
-        // FIXME: Bug 1147371.
-        // We ignore IteratorClose for now.
-        return obj[name];
-      }
-
       let names = prefix.concat(ToString(name));
       log("rhs get " + names.join("::"));
       let v = obj[name];
@@ -101,6 +95,8 @@ class C2 extends C1 {
                "rhs get @@iterator()::next()::done",
                "rhs get @@iterator()::next()::value",
                "lhs set a",
+
+               "rhs get @@iterator()::return",
              ].join(","));
     assert.sameValue(this.values.a, "A");
 
@@ -119,6 +115,8 @@ class C2 extends C1 {
                "rhs get @@iterator()::next()::done",
                "rhs get @@iterator()::next()::value",
                "lhs set a",
+
+               "rhs get @@iterator()::return",
              ].join(","));
     assert.sameValue(this.values.a, "A");
 
@@ -293,6 +291,8 @@ class C2 extends C1 {
                "rhs call @@iterator()::next()::value::@@iterator()::next",
                "rhs get @@iterator()::next()::value::@@iterator()::next()::done",
                "lhs set b",
+
+               "rhs get @@iterator()::return",
              ].join(","));
     assert.sameValue(this.values.a, "A");
     assert.sameValue(this.values.b.length, 1);
@@ -351,6 +351,8 @@ class C2 extends C1 {
                "lhs before name a",
                "rhs get @@iterator()::next()::value::a",
                "lhs set a",
+
+               "rhs get @@iterator()::return",
              ].join(","));
     assert.sameValue(this.values.a, "A");
 
@@ -410,6 +412,8 @@ class C2 extends C1 {
                "rhs get a::@@iterator()::next()::done",
                "rhs get a::@@iterator()::next()::value",
                "lhs set b",
+
+               "rhs get a::@@iterator()::return",
              ].join(","));
     assert.sameValue(this.values.b, "B");
 
@@ -543,6 +547,8 @@ class C2 extends C1 {
                "rhs get @@iterator()::next()::value::@@iterator()::next()::value::d::f::@@iterator()::next()::done",
                "rhs get @@iterator()::next()::value::@@iterator()::next()::value::d::f::@@iterator()::next()::value",
                "lhs set g",
+               "rhs get @@iterator()::next()::value::@@iterator()::next()::value::d::f::@@iterator()::return",
+               "rhs get @@iterator()::next()::value::@@iterator()::return",
 
                "rhs call @@iterator()::next",
                "rhs get @@iterator()::next()::done",
@@ -577,6 +583,8 @@ class C2 extends C1 {
                "rhs get @@iterator()::next()::value::i::@@iterator()::next()::value::k::@@iterator()::next()::done",
                "rhs get @@iterator()::next()::value::i::@@iterator()::next()::value::k::@@iterator()::next()::value",
                "lhs set l",
+               "rhs get @@iterator()::next()::value::i::@@iterator()::next()::value::k::@@iterator()::return",
+               "rhs get @@iterator()::next()::value::i::@@iterator()::return",
 
                "rhs call @@iterator()::next",
                "rhs get @@iterator()::next()::done",
@@ -630,6 +638,8 @@ class C2 extends C1 {
                "rhs get @@iterator()::next()::value::@@iterator()::next()::value::p::r::@@iterator()::next()::done",
                "rhs get @@iterator()::next()::value::@@iterator()::next()::value::p::r::@@iterator()::next()::value",
                "lhs set s",
+               "rhs get @@iterator()::next()::value::@@iterator()::next()::value::p::r::@@iterator()::return",
+               "rhs get @@iterator()::next()::value::@@iterator()::return",
 
                "lhs before name t",
                "lhs set t",
@@ -668,6 +678,8 @@ class C2 extends C1 {
                "rhs get @@iterator()::next()::value::@@iterator()::next()::value::w::y::@@iterator()::next()::done",
                "rhs get @@iterator()::next()::value::@@iterator()::next()::value::w::y::@@iterator()::next()::value",
                "lhs set z",
+               "rhs get @@iterator()::next()::value::@@iterator()::next()::value::w::y::@@iterator()::return",
+               "rhs get @@iterator()::next()::value::@@iterator()::return",
 
                "lhs before name length",
                "lhs set length",
diff --git a/test/staging/sm/destructuring/order.js b/test/staging/sm/destructuring/order.js
index 3e841293aa..58d5065b7e 100644
--- a/test/staging/sm/destructuring/order.js
+++ b/test/staging/sm/destructuring/order.js
@@ -46,12 +46,6 @@ function ToString(name) {
 function logger(obj, prefix=[]) {
   let wrapped = new Proxy(obj, {
     get(that, name) {
-      if (name == "return") {
-        // FIXME: Bug 1147371.
-        // We ignore IteratorClose for now.
-        return obj[name];
-      }
-
       let names = prefix.concat(ToString(name));
       log("rhs get " + names.join("::"));
       let v = obj[name];
@@ -91,6 +85,8 @@ assert.sameValue(logs.join(","),
            "rhs get @@iterator()::next()::done",
            "rhs get @@iterator()::next()::value",
            "lhs set a",
+
+           "rhs get @@iterator()::return",
          ].join(","));
 assert.sameValue(storage.values.a, "A");
 
@@ -110,6 +106,8 @@ assert.sameValue(logs.join(","),
            "rhs get @@iterator()::next()::done",
            "rhs get @@iterator()::next()::value",
            "lhs set a",
+
+           "rhs get @@iterator()::return",
          ].join(","));
 assert.sameValue(storage.values.a, "A");
 
@@ -295,6 +293,8 @@ assert.sameValue(logs.join(","),
            "rhs call @@iterator()::next()::value::@@iterator()::next",
            "rhs get @@iterator()::next()::value::@@iterator()::next()::done",
            "lhs set b",
+
+           "rhs get @@iterator()::return",
          ].join(","));
 assert.sameValue(storage.values.a, "A");
 assert.sameValue(storage.values.b.length, 1);
@@ -356,6 +356,8 @@ assert.sameValue(logs.join(","),
            "lhs before name a",
            "rhs get @@iterator()::next()::value::a",
            "lhs set a",
+
+           "rhs get @@iterator()::return",
          ].join(","));
 assert.sameValue(storage.values.a, "A");
 
@@ -419,6 +421,8 @@ assert.sameValue(logs.join(","),
            "rhs get a::@@iterator()::next()::done",
            "rhs get a::@@iterator()::next()::value",
            "lhs set b",
+
+           "rhs get a::@@iterator()::return",
          ].join(","));
 assert.sameValue(storage.values.b, "B");
 
@@ -558,6 +562,8 @@ assert.sameValue(logs.join(","),
            "rhs get @@iterator()::next()::value::@@iterator()::next()::value::d::f::@@iterator()::next()::done",
            "rhs get @@iterator()::next()::value::@@iterator()::next()::value::d::f::@@iterator()::next()::value",
            "lhs set g",
+           "rhs get @@iterator()::next()::value::@@iterator()::next()::value::d::f::@@iterator()::return",
+           "rhs get @@iterator()::next()::value::@@iterator()::return",
 
            "rhs call @@iterator()::next",
            "rhs get @@iterator()::next()::done",
@@ -595,6 +601,8 @@ assert.sameValue(logs.join(","),
            "rhs get @@iterator()::next()::value::i::@@iterator()::next()::value::k::@@iterator()::next()::done",
            "rhs get @@iterator()::next()::value::i::@@iterator()::next()::value::k::@@iterator()::next()::value",
            "lhs set l",
+           "rhs get @@iterator()::next()::value::i::@@iterator()::next()::value::k::@@iterator()::return",
+           "rhs get @@iterator()::next()::value::i::@@iterator()::return",
 
            "rhs call @@iterator()::next",
            "rhs get @@iterator()::next()::done",
@@ -653,6 +661,8 @@ assert.sameValue(logs.join(","),
            "rhs get @@iterator()::next()::value::@@iterator()::next()::value::p::r::@@iterator()::next()::done",
            "rhs get @@iterator()::next()::value::@@iterator()::next()::value::p::r::@@iterator()::next()::value",
            "lhs set s",
+           "rhs get @@iterator()::next()::value::@@iterator()::next()::value::p::r::@@iterator()::return",
+           "rhs get @@iterator()::next()::value::@@iterator()::return",
 
            "lhs before obj t",
            "lhs before name t",
@@ -696,6 +706,8 @@ assert.sameValue(logs.join(","),
            "rhs get @@iterator()::next()::value::@@iterator()::next()::value::w::y::@@iterator()::next()::done",
            "rhs get @@iterator()::next()::value::@@iterator()::next()::value::w::y::@@iterator()::next()::value",
            "lhs set z",
+           "rhs get @@iterator()::next()::value::@@iterator()::next()::value::w::y::@@iterator()::return",
+           "rhs get @@iterator()::next()::value::@@iterator()::return",
 
            "lhs before obj length",
            "lhs before name length",
diff --git a/test/staging/sm/generators/iteration.js b/test/staging/sm/generators/iteration.js
index 1ee0041404..70e2ff109f 100644
--- a/test/staging/sm/generators/iteration.js
+++ b/test/staging/sm/generators/iteration.js
@@ -229,19 +229,6 @@ TestGenerator(
     "foo",
     [1, 2, undefined]);
 
-// FIXME: Capture the generator object as "this" in new g().  Bug 907742.
-// TestGenerator(
-//     function g18() {
-//         function* g() { yield this.x; yield this.y; }
-//         var iter = new g;
-//         iter.x = 1;
-//         iter.y = 2;
-//         return iter;
-//     },
-//     [1, 2, undefined],
-//     "foo",
-//     [1, 2, undefined]);
-
 TestGenerator(
     function* g19() {
         var x = 1;