From f7a1eb806cf6a4a5bd189cc4b51df2121fb71e6b Mon Sep 17 00:00:00 2001 From: patricejiang Date: Fri, 14 Dec 2018 15:39:33 +0800 Subject: [PATCH] [lua tests]fix evalJs 'alert' frozen --- .../UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.cpp | 2 +- tests/lua-tests/src/WebViewTest/WebViewTest.lua | 2 +- tests/lua-tests/src/mainMenu.lua | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.cpp b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.cpp index 07dffeb3a831..582e66b8646b 100644 --- a/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.cpp +++ b/tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIWebViewTest/UIWebViewTest.cpp @@ -144,7 +144,7 @@ bool WebViewTest::init() evalJsBtn->setPosition(VisibleRect::center() - Vec2( _webView->getContentSize().width/2 + evalJsBtn->getContentSize().width/2 + 10,-50 )); evalJsBtn->addClickEventListener([=](Ref*){ - _webView->evaluateJS("alert(\"hello\")"); + _webView->evaluateJS("setTimeout(function(){alert(\"hello\");}, 0)"); }); evalJsBtn->setName("evalJs"); this->addChild(evalJsBtn); diff --git a/tests/lua-tests/src/WebViewTest/WebViewTest.lua b/tests/lua-tests/src/WebViewTest/WebViewTest.lua index ab862092ab4e..29dad3ab1b0c 100644 --- a/tests/lua-tests/src/WebViewTest/WebViewTest.lua +++ b/tests/lua-tests/src/WebViewTest/WebViewTest.lua @@ -103,7 +103,7 @@ function WebViewTest:init() evalJsBtn:setTitleText("Evaluate JS") evalJsBtn:setPosition(winSize.width / 2 - self._webView:getContentSize().width/2 - evalJsBtn:getContentSize().width/2 - 30, winSize.height / 2 - 50) evalJsBtn:addClickEventListener(function(sender) - self._webView:evaluateJS("alert(\"hello\")") + self._webView:evaluateJS("setTimeout(function(){alert(\"hello\");}, 0);") end) self:addChild(evalJsBtn) end diff --git a/tests/lua-tests/src/mainMenu.lua b/tests/lua-tests/src/mainMenu.lua index 02c802d2f87f..b0b01e2b29fe 100644 --- a/tests/lua-tests/src/mainMenu.lua +++ b/tests/lua-tests/src/mainMenu.lua @@ -200,11 +200,13 @@ function CreateTestMenu() CloseMenu:addChild(CloseItem) menuLayer:addChild(CloseMenu) + local targetPlatform = cc.Application:getInstance():getTargetPlatform() + -- add menu items for tests local MainMenu = cc.Menu:create() local index = 0 local obj = nil - for index, obj in pairs(_allTests) do + for index, obj in pairs(_allTests) do local testLabel = cc.Label:createWithTTF(index .. ". " .. obj.name, s_arialPath, 24) testLabel:setAnchorPoint(cc.p(0.5, 0.5)) local testMenuItem = cc.MenuItemLabel:create(testLabel)