aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/blueimp/jquery-file-upload/wdio/chrome.js
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2020-01-14 13:34:56 -0800
committerzotlabs <mike@macgirvin.com>2020-01-14 13:34:56 -0800
commit293d411efb28b8f20a0208e3c52883e9fbb8cea7 (patch)
treea8b0af66015815d56342daf8301ab5ae095eda0a /vendor/blueimp/jquery-file-upload/wdio/chrome.js
parent2a287e6def5ab54037222c963ab0875faf62fc1a (diff)
parentd96f4340e80207a29a5c1c49cae8c25e3934d5ae (diff)
downloadvolse-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/chrome.js')
-rw-r--r--vendor/blueimp/jquery-file-upload/wdio/chrome.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/vendor/blueimp/jquery-file-upload/wdio/chrome.js b/vendor/blueimp/jquery-file-upload/wdio/chrome.js
index 6d1650e66..fc7264417 100644
--- a/vendor/blueimp/jquery-file-upload/wdio/chrome.js
+++ b/vendor/blueimp/jquery-file-upload/wdio/chrome.js
@@ -1,6 +1,8 @@
'use strict'
-exports.config = Object.assign({}, require('./hooks'), {
+/* eslint-disable jsdoc/valid-types */
+/** @type WebdriverIO.Config */
+const config = {
hostname: 'chromedriver',
path: '/',
capabilities: [
@@ -33,4 +35,6 @@ exports.config = Object.assign({}, require('./hooks'), {
},
assetsDir: '/home/webdriver/assets/',
baseUrl: 'http://example'
-})
+}
+
+exports.config = Object.assign({}, require('./hooks'), config)