Use class name 'global' when marshalling global, so that it appears i…

…n the console for the global object
provegard · Apr 11, 2018 · b927486 · b927486
1 parent 7c82bff
commit b927486
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/scala/com/programmaticallyspeaking/ncd/nashorn/Marshaller.scala b/src/main/scala/com/programmaticallyspeaking/ncd/nashorn/Marshaller.scala
@@ -203,6 +203,8 @@ class Marshaller(mappingRegistry: MappingRegistry, cache: MarshallerCache = Mars
             case _ =>
               toObject(mirror)
           }
+        case "global" =>
+          ObjectNode("global", objectId(value))
         case _ =>
           toObject(mirror)
       }

diff --git a/src/test/scala/com/programmaticallyspeaking/ncd/nashorn/RealMarshallerTest.scala b/src/test/scala/com/programmaticallyspeaking/ncd/nashorn/RealMarshallerTest.scala
@@ -196,7 +196,8 @@ class RealMarshallerTest extends RealMarshallerTestFixture with Inside with Tabl
         ("Java object", "new java.util.ArrayList()", "java.util.ArrayList"),
         ("JSObject object", s"createInstance('${classOf[ObjectLikeJSObject].getName}')", "Object"),
         ("JS 'class'", s"(function() { return new MyClass(); function MyClass() {} })()", "MyClass"),
-        ("DataView", "new DataView(new ArrayBuffer(10))", "DataView")
+        ("DataView", "new DataView(new ArrayBuffer(10))", "DataView"),
+        ("Global", "this", "global")
       )
 
       forAll(classNameCases) { (desc, expr, className) =>