From 33dcb28ba4ae7807cd9eac8d424aeea795a05a94 Mon Sep 17 00:00:00 2001
From: Jaromir Obr <jaromir.obr@gmail.com>
Date: Sun, 26 Jan 2020 18:09:04 +0100
Subject: [PATCH 1/2] #2166: waitForClickable: Timeout doesn't work, method
 call fails immediately Fixed timeout, native webdriverio method requires
 timeout in ms

---
 lib/helper/WebDriver.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helper/WebDriver.js b/lib/helper/WebDriver.js
index 697c1276d..4f2762aed 100644
--- a/lib/helper/WebDriver.js
+++ b/lib/helper/WebDriver.js
@@ -1782,7 +1782,7 @@ class WebDriver extends Helper {
     assertElementExists(res, locator);
 
     return res.waitForClickable({
-      timeout: waitTimeout,
+      timeout: waitTimeout * 1000,
       timeoutMsg: `element ${res.selector} still not clickable after ${waitTimeout} sec`,
     });
   }

From 6da4047615ef8e8390ec2e71351042e6f1c87605 Mon Sep 17 00:00:00 2001
From: Jaromir Obr <jaromir.obr@gmail.com>
Date: Fri, 7 Feb 2020 21:55:16 +0100
Subject: [PATCH 2/2] Docker: Colors in output are disabled in mode
 'multiple-run' in dockerized environment #1876

Added option --colors for mode run-multiple
---
 bin/codecept.js             | 3 +++
 lib/command/run-multiple.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/codecept.js b/bin/codecept.js
index 47969b41c..88c01adf0 100755
--- a/bin/codecept.js
+++ b/bin/codecept.js
@@ -190,6 +190,9 @@ program.command('run-multiple [suites...]')
   .option('-R, --reporter <name>', 'specify the reporter to use')
   .option('--recursive', 'include sub directories')
 
+  // mocha options
+  .option('--colors', 'force enabling of colors')
+
   .action(require('../lib/command/run-multiple'));
 
 program.command('info [path]')
diff --git a/lib/command/run-multiple.js b/lib/command/run-multiple.js
index ebef6da0d..8bf77b4e2 100644
--- a/lib/command/run-multiple.js
+++ b/lib/command/run-multiple.js
@@ -14,7 +14,7 @@ const {
 const runner = path.join(__dirname, '/../../bin/codecept');
 let config;
 const childOpts = {};
-const copyOptions = ['override', 'steps', 'reporter', 'verbose', 'config', 'reporter-options', 'grep', 'fgrep', 'invert', 'debug', 'plugins'];
+const copyOptions = ['override', 'steps', 'reporter', 'verbose', 'config', 'reporter-options', 'grep', 'fgrep', 'invert', 'debug', 'plugins', 'colors'];
 let overrides = {};
 
 // codeceptjs run-multiple smoke:chrome regression:firefox - will launch smoke run in chrome and regression in firefox