diff options
| author | zotlabs <mike@macgirvin.com> | 2020-01-14 13:34:56 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2020-01-14 13:34:56 -0800 |
| commit | 293d411efb28b8f20a0208e3c52883e9fbb8cea7 (patch) | |
| tree | a8b0af66015815d56342daf8301ab5ae095eda0a /vendor/blueimp/jquery-file-upload/wdio/safari.js | |
| parent | 2a287e6def5ab54037222c963ab0875faf62fc1a (diff) | |
| parent | d96f4340e80207a29a5c1c49cae8c25e3934d5ae (diff) | |
| download | volse-hubzilla-293d411efb28b8f20a0208e3c52883e9fbb8cea7.tar.gz volse-hubzilla-293d411efb28b8f20a0208e3c52883e9fbb8cea7.tar.bz2 volse-hubzilla-293d411efb28b8f20a0208e3c52883e9fbb8cea7.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'vendor/blueimp/jquery-file-upload/wdio/safari.js')
| -rw-r--r-- | vendor/blueimp/jquery-file-upload/wdio/safari.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vendor/blueimp/jquery-file-upload/wdio/safari.js b/vendor/blueimp/jquery-file-upload/wdio/safari.js index 360909b33..d252d0d5d 100644 --- a/vendor/blueimp/jquery-file-upload/wdio/safari.js +++ b/vendor/blueimp/jquery-file-upload/wdio/safari.js @@ -1,6 +1,8 @@ 'use strict' -exports.config = Object.assign({}, require('./chrome').config, { +/* eslint-disable jsdoc/valid-types */ +/** @type WebdriverIO.Config */ +const config = { // Docker for Mac host address: hostname: 'host.docker.internal', capabilities: [ @@ -17,4 +19,6 @@ exports.config = Object.assign({}, require('./chrome').config, { stopDelay: 500 }, assetsDir: process.env.MACOS_ASSETS_DIR -}) +} + +exports.config = Object.assign({}, require('./chrome').config, config) |