fix(best): fix timeout and config

salesforce · May 22, 2018 · cb0f011 · cb0f011
1 parent 7d6f124
commit cb0f011
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/examples/simple_benchmark/best.ie11.config.js b/examples/simple_benchmark/best.ie11.config.js
@@ -1,9 +1,6 @@
 module.exports = {
     projectName: 'simple-benchmark-ie11',
     plugins: ['rollup-plugin-compat'],
-    benchmarkOnClient: true,
-    benchmarkMinIterations: 10,
-    useMacroTaskAfterBenchmark: false,
     "runnerConfig": [
         {
         "runner": "@best/runner-ie11",

diff --git a/examples/simple_lwc_benchmark/best.ie11.config.js b/examples/simple_lwc_benchmark/best.ie11.config.js
@@ -7,8 +7,6 @@ module.exports = {
             mode: 'compat', // We don't really need prod here since this is for test best itself
         }]
     ],
-    benchmarkMinIterations: 10,
-    benchmarkOnClient: false,
     "runnerConfig": [
         {
             "runner": "@best/runner-ie11",

diff --git a/packages/best-runner-ie11/src/index.js b/packages/best-runner-ie11/src/index.js
@@ -9,7 +9,8 @@ const BROWSER_OPTIONS = {
         version: '11',
         ignoreZoomSetting: true,
         initialBrowserUrl: 'about:blank',
-        nativeEvents: false
+        nativeEvents: false,
+        timeouts: {"implicit": 0, "pageLoad": 300000, "script": 60000},
     },
     host: 'localhost',
     port: 4444
@@ -79,7 +80,7 @@ function runIteration(page, state, opts) {
                 done(data);
             })
             .catch(function(e) {
-                done(e);
+                throw e;
             });
     }, opts);
 }
@@ -114,11 +115,10 @@ export async function run({ benchmarkName, benchmarkEntry }, projectConfig, glob
     const opts = normalizeRuntimeOptions(projectConfig);
     const state = initializeBenchmarkState(opts);
     const { projectName } = projectConfig;
-    const browserOptions = Object.assign({}, BROWSER_OPTIONS, projectConfig.benchmarkRunnerConfig);
 
     let browser;
     try {
-        browser = webdriverio.remote(browserOptions);
+        browser = webdriverio.remote(BROWSER_OPTIONS);
         const environment = await normalizeEnvironment(browser, projectConfig, globalConfig);
 
         messager.onBenchmarkStart(benchmarkName, projectName);