You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by sh...@apache.org on 2021/01/26 09:29:19 UTC

[echarts-examples] branch gh-pages updated: e2e: fix some issues. include two map test

This is an automated email from the ASF dual-hosted git repository.

shenyi pushed a commit to branch gh-pages
in repository https://gitbox.apache.org/repos/asf/echarts-examples.git


The following commit(s) were added to refs/heads/gh-pages by this push:
     new 357db0b  e2e: fix some issues. include two map test
357db0b is described below

commit 357db0b80de4769d0a49470cd5a976c4dbc8ec61
Author: pissang <bm...@gmail.com>
AuthorDate: Tue Jan 26 17:29:01 2021 +0800

    e2e: fix some issues. include two map test
---
 common/task.js |  4 ++++
 e2e/config.js  |  6 +++---
 e2e/main.js    | 11 +++++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/common/task.js b/common/task.js
index fafb02c..f2e5f1c 100644
--- a/common/task.js
+++ b/common/task.js
@@ -41,6 +41,10 @@ function runTasks(
         for (let i = 0; i < concurrency; i++) {
             addTask();
         }
+
+        if (!runningTaskCount) {
+            resolve(rets);
+        }
     });
 }
 
diff --git a/e2e/config.js b/e2e/config.js
index 56efa76..48935f3 100644
--- a/e2e/config.js
+++ b/e2e/config.js
@@ -6,17 +6,17 @@ module.exports = {
         {
             name: 'zrender',    // package name
             dir: nodePath.resolve(__dirname, '../../zrender'),
-            git: 'ecomfe/zrender#release'
+            git: 'ecomfe/zrender#master'
         },
         {
             name: 'echarts',
             dir: nodePath.resolve(__dirname, '../../echarts'),
-            git: 'apache/echarts#release'
+            git: 'apache/echarts#master'
         },
         {
             name: 'echarts-gl',
             dir: nodePath.resolve(__dirname, '../../echarts-gl'),
-            git: 'ecomfe/echarts-gl#next'
+            git: 'ecomfe/echarts-gl#master'
         },
         {
             name: 'echarts-wordcloud',
diff --git a/e2e/main.js b/e2e/main.js
index d0d0b65..575488c 100644
--- a/e2e/main.js
+++ b/e2e/main.js
@@ -294,10 +294,13 @@ async function buildRunCode() {
             'CanvasRenderer'
         ]);
 
-        if (deps.includes('MapChart')
-            || deps.includes('GeoComponent')
-            || option.bmap) {
-            console.warn(chalk.yellow(`Ignored map tests.${fileName}`));
+        if (
+            !(testName === 'map-HK' || testName === 'map-usa')  // Only test these two map examples
+            && (deps.includes('MapChart')
+                || deps.includes('GeoComponent')
+                || option.bmap)
+        ) {
+            console.warn(chalk.yellow(`Ignored map tests ${testName}`));
             return;
         }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org