1 files changed, 51 insertions, 0 deletions
diff --git a/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp b/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp
new file mode 100644
index 0000000000..37c57fb3c3
--- /dev/null
+++ b/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: set ts=8 sts=2 et sw=2 tw=80:
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "js/PropertyAndElement.h"  // JS_DefineProperty
+#include "js/PropertyDescriptor.h"  // JS_GetOwnPropertyDescriptor
+#include "jsapi-tests/tests.h"
+
+static bool NativeGetterSetter(JSContext* cx, unsigned argc, JS::Value* vp) {
+  return true;
+}
+
+BEGIN_TEST(testDefineGetterSetterNonEnumerable) {
+  static const char PROPERTY_NAME[] = "foo";
+
+  JS::RootedValue vobj(cx);
+  JS::RootedObject obj(cx, JS_NewPlainObject(cx));
+  CHECK(obj);
+  vobj.setObject(*obj);
+
+  JSFunction* funGet = JS_NewFunction(cx, NativeGetterSetter, 0, 0, "get");
+  CHECK(funGet);
+  JS::RootedObject funGetObj(cx, JS_GetFunctionObject(funGet));
+  JS::RootedValue vget(cx, JS::ObjectValue(*funGetObj));
+
+  JSFunction* funSet = JS_NewFunction(cx, NativeGetterSetter, 1, 0, "set");
+  CHECK(funSet);
+  JS::RootedObject funSetObj(cx, JS_GetFunctionObject(funSet));
+  JS::RootedValue vset(cx, JS::ObjectValue(*funSetObj));
+
+  JS::RootedObject vObject(cx, vobj.toObjectOrNull());
+  CHECK(JS_DefineProperty(cx, vObject, PROPERTY_NAME, funGetObj, funSetObj,
+                          JSPROP_ENUMERATE));
+
+  CHECK(JS_DefineProperty(cx, vObject, PROPERTY_NAME, funGetObj, funSetObj,
+                          JSPROP_PERMANENT));
+
+  JS::Rooted<mozilla::Maybe<JS::PropertyDescriptor>> desc(cx);
+  CHECK(JS_GetOwnPropertyDescriptor(cx, vObject, PROPERTY_NAME, &desc));
+  CHECK(desc.isSome());
+  CHECK(desc->hasGetter());
+  CHECK(desc->hasSetter());
+  CHECK(!desc->configurable());
+  CHECK(!desc->enumerable());
+
+  return true;
+}
+END_TEST(testDefineGetterSetterNonEnumerable)