[1.8>1.9] [MERGE #4631 @digitalinfinity] OS 15681335: Fix inspection of Promise state in debugger

digitalinfinity · digitalinfinity · commit 8c0764e1aac9 · 2018-01-31T20:59:25.000-08:00
Merge pull request #4631 from digitalinfinity:os_15681335_1.8 RecyclablePromiseObjectWalker::Get had a missing break when inspecting the state of a promise, causing an unresolved promise to show up as resolved in F12. Fixed the logic here.
diff --git a/lib/Runtime/Debug/DiagObjectModel.cpp b/lib/Runtime/Debug/DiagObjectModel.cpp
@@ -3896,6 +3896,7 @@ namespace Js
                 break;
             case JavascriptPromise::PromiseStatusCode_Unresolved:
                 pResolvedObject->obj = scriptContext->GetLibrary()->CreateStringFromCppLiteral(_u("pending"));
+                break;
             case JavascriptPromise::PromiseStatusCode_HasResolution:
                 pResolvedObject->obj = scriptContext->GetLibrary()->CreateStringFromCppLiteral(_u("resolved"));
                 break;
diff --git a/test/DebuggerCommon/promiseDisplay.js.dbg.baseline b/test/DebuggerCommon/promiseDisplay.js.dbg.baseline
@@ -11,7 +11,7 @@
         },
         "someOtherProp": "string before",
         "[Promise]": {
-          "[status]": "string resolved",
+          "[status]": "string pending",
           "[value]": "string undefined"
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`},`
`12`	`12`	`"someOtherProp": "string before",`
`13`	`13`	`"[Promise]": {`
`14`		`- "[status]": "string resolved",`
	`14`	`+ "[status]": "string pending",`
`15`	`15`	`"[value]": "string undefined"`
`16`	`16`	`}`
`17`	`17`	`}`