Merge pull request #13015 from VisualSJ/v3.7.1-12940

[ci skip] Moveing ActionTimeline tests

tests/js-tests/project.json

@@ -118,7 +118,6 @@
         "src/ExtensionsTest/PluginXTest/PluginXTestsManager.js",
         "src/ExtensionsTest/PluginXTest/IOSIAPTest.js",
         "src/ExtensionsTest/PluginXTest/AnalyticsTest.js",
-        "src/ExtensionsTest/ActionTimelineTest/ActionTimelineTest.js",
         "src/CocoStudioTest/ArmatureTest/ArmatureTest.js",
         "src/CocoStudioTest/ComponentsTest/ComponentsTestScene.js",
         "src/CocoStudioTest/ComponentsTest/EnemyController.js",
@@ -151,6 +150,7 @@
         "src/CocoStudioTest/CustomTest/CustomParticleWidgetTest/CustomParticleWidgetTest.js",
         "src/CocoStudioTest/CustomTest/CustomImageScene/CustomImageScene.js",
         "src/CocoStudioTest/CustomTest/CustomGUIScene.js",
+        "src/CocoStudioTest/ActionTimelineTest/ActionTimelineTest.js",
         "src/GUITest/UIScene.js",
         "src/GUITest/UIButtonTest/UIButtonTest.js",
         "src/GUITest/UICheckBoxTest/UICheckBoxTest.js",

tests/js-tests/src/CocoStudioTest/ActionTimelineTest/ActionTimelineTest.js

@@ -105,7 +105,7 @@ var runActionTimeLineTest;
                 menus.push(menuItem);
             });
             var menuItem = new cc.MenuItemFont("Back", function(){
-                var scene = new ExtensionsTestScene();
+                var scene = new CocoStudioTestScene();
                 scene.runThisTest();
             }, this);
             menuItem.setPosition(325, -175);

tests/js-tests/src/CocoStudioTest/CocoStudioTest.js

@@ -51,6 +51,12 @@ var cocoStudioTestItemNames = [
         testScene:function(){
             runParserTest();
         }
+    },
+    {
+        itemTitle:"ActionTimeLineTest",
+        testScene:function () {
+            runActionTimeLineTest();
+        }
     }
 ];
 

tests/js-tests/src/ExtensionsTest/ExtensionsTest.js

@@ -87,12 +87,6 @@ var extensionsTestItemNames = [
         testScene:function () {
             runCCPoolTest();
         }
-    },
-    {
-        itemTitle:"ActionTimeLineTest",
-        testScene:function () {
-            runActionTimeLineTest();
-        }
     }
 ];
 

tests/js-tests/src/tests_resources.js

@@ -547,9 +547,7 @@ var g_extensions = [
     ccbjs + "ccb/markerfelt24shadow.fnt",
 
     ccbjs + "ccb/grossini-generic.plist",
-    ccbjs + "ccb/animated-grossini.plist",
+    ccbjs + "ccb/animated-grossini.plist"
-
-    "ActionTimeline/DemoPlayer_skeleton.json"
 ];
 
 var g_cocoStudio = [
@@ -908,7 +906,9 @@ var g_cocoStudio = [
     "Particles/BoilingFoam.plist",
     "ccs-res/cocosui/CustomImageViewTest/NewProject_2_1.ExportJson",
     "ccs-res/cocosui/CustomImageViewTest/NewProject_20.plist",
-    "ccs-res/cocosui/CustomImageViewTest/NewProject_20.png"
+    "ccs-res/cocosui/CustomImageViewTest/NewProject_20.png",
+
+    "ActionTimeline/DemoPlayer_skeleton.json"
 ];
 
 var g_ui = [