Merge 815f00d into 6cc4633

Tencent · Dec 10, 2021 · ad89977 · ad89977
2 parents 6cc4633 + 815f00d
commit ad89977
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -236,4 +236,4 @@ jobs:
         run: |
           cd build
           # exclude failed tests
-          node UnitTests.js '--gtest_filter=-ThreadPool.*:EngineScopeTest.ExitEngine:EngineScopeTest.TwoThreads:EngineScopeTest.ThreadLocal:MessageQueue.Interrupt:MessageQueue.Shutdown:MessageQueue.ShutdownNow:MessageQueue.FullAndPostInsideLoopQueue:ReferenceTest.WeakGc:ReferenceTest.WeakGc:ReferenceTest.GlobalNotClear:ReferenceTest.GlobalOnEngineDestroy:ReferenceTest.WeakOnEngineDestroy:ReferenceTest.WeakNotClrear:ManagedObjectTest.EngineDispose:ManagedObjectTest.FunctionCallback:PressureTest.All'
+          node UnitTests.js '--gtest_filter=-ThreadPool.*:EngineScopeTest.ExitEngine:EngineScopeTest.TwoThreads:EngineScopeTest.ThreadLocal:MessageQueue.Interrupt:MessageQueue.Shutdown:MessageQueue.ShutdownNow:MessageQueue.FullAndPostInsideLoopQueue:ReferenceTest.WeakGc:ReferenceTest.WeakGc:ReferenceTest.GlobalNotClear:ReferenceTest.GlobalOnEngineDestroy:ReferenceTest.WeakOnEngineDestroy:ReferenceTest.WeakNotClrear:ManagedObjectTest.EngineDispose:ManagedObjectTest.FunctionCallback:PressureTest.All:EngineTest.JsPromiseTest'
diff --git a/backend/QuickJs/QjsEngine.cc b/backend/QuickJs/QjsEngine.cc
@@ -196,6 +196,7 @@ void QjsEngine::scheduleTick() {
         [](auto& m) {
           auto eng = static_cast<QjsEngine*>(m.ptr0);
           JSContext* ctx = nullptr;
+          EngineScope scope(eng);
           while (JS_ExecutePendingJob(eng->runtime_, &ctx) > 0) {
           }
           eng->tickScheduled_ = false;

diff --git a/test/src/EngineTest.cc b/test/src/EngineTest.cc
@@ -133,4 +133,29 @@ TEST_F(EngineTest, LuaBuiltIns) {
 
 #endif
 
-}  // namespace script::test
+#ifdef SCRIPTX_LANG_JAVASCRIPT
+TEST_F(EngineTest, JsPromiseTest) {
+  EngineScope scope(engine);
+
+  int value = 0;
+  auto setValue = Function::newFunction([&value](int val) { value = val; });
+  engine->set("setValue", setValue);
+  engine->eval(
+      u8R"(
+        const promise = new Promise((resolve, reject) => {
+            resolve('Ok');
+        });
+
+        promise.then(x => {
+            console.log(x);
+            setValue(1);
+        });
+    )");
+
+  engine->messageQueue()->shutdown(true);
+  engine->messageQueue()->loopQueue(utils::MessageQueue::LoopType::kLoopAndWait);
+  EXPECT_EQ(value, 1);
+}
+#endif
+
+}  // namespace script::test