diff --git a/bigbluebutton-html5/package-lock.json b/bigbluebutton-html5/package-lock.json index 759240950ac7240db1e39ab69d5984252504b7f4..3aa6db3f79db6c5151d7693c2568df77d3efdd4f 100644 --- a/bigbluebutton-html5/package-lock.json +++ b/bigbluebutton-html5/package-lock.json @@ -27,6 +27,12 @@ } } }, + "adm-zip": { + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz", + "integrity": "sha1-hgbCy/HEJs6MjsABdER/1Jtur8E=", + "dev": true + }, "ajv": { "version": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz", "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=", @@ -1667,6 +1673,12 @@ "version": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, + "ini": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", + "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", + "dev": true + }, "inquirer": { "version": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", "integrity": "sha1-ndLyrXZdyrH/BEO0kUQqILoifck=", @@ -2959,6 +2971,7 @@ "readable-stream": { "version": "git+https://github.com/meteor/readable-stream.git#d64a64aa6061b9b6855feff4d09e58fb3b2e4502", "requires": { + "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "inherits": "2.0.3", "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", @@ -3792,14 +3805,6 @@ "prop-types": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz" } }, - "react-toastify": { - "version": "https://registry.npmjs.org/react-toastify/-/react-toastify-2.1.6.tgz", - "integrity": "sha1-Gkh/rSekjZ6u9FaDXpVevnmxp5A=", - "requires": { - "prop-types": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", - "react-transition-group": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.2.1.tgz" - } - }, "react-toggle": { "version": "https://registry.npmjs.org/react-toggle/-/react-toggle-4.0.2.tgz", "integrity": "sha1-d/SHhg77h/r9GXZyotuMiFvhRA8=", @@ -4630,6 +4635,25 @@ } } }, + "webdriver-manager": { + "version": "12.0.6", + "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.0.6.tgz", + "integrity": "sha1-PfGkgZdwELTL+MnYXHpXeCjA5ws=", + "dev": true, + "requires": { + "adm-zip": "0.4.7", + "chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "del": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", + "glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "ini": "1.3.4", + "minimist": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "q": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "request": "https://registry.npmjs.org/request/-/request-2.83.0.tgz", + "rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "semver": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", + "xml2js": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz" + } + }, "webdriverio": { "version": "https://registry.npmjs.org/webdriverio/-/webdriverio-4.8.0.tgz", "integrity": "sha1-1Skpt0kID4mWf24WFAUcvIFy0TI=", diff --git a/bigbluebutton-html5/package.json b/bigbluebutton-html5/package.json index 16147ddc73fbaaeb64d7b9276a55f6f7c8696c0b..487986e4699b0d342e7b3cbee97c1b8248568dd8 100644 --- a/bigbluebutton-html5/package.json +++ b/bigbluebutton-html5/package.json @@ -70,6 +70,7 @@ "wdio-junit-reporter": "~0.3.1", "wdio-spec-reporter": "~0.1.2", "wdio-visual-regression-service": "~0.8.0", + "webdriver-manager": "~12.0.6", "webdriverio": "~4.8.0" }, "cssModules": { diff --git a/bigbluebutton-html5/tests/webdriverio/specs/acceptance/login.spec.js b/bigbluebutton-html5/tests/webdriverio/specs/acceptance/login.spec.js index 528ccbfd79e6da9f6947e2348771fce5400655d6..5f2601ea95120d4fcaca57d4fc3eb908addc1614 100644 --- a/bigbluebutton-html5/tests/webdriverio/specs/acceptance/login.spec.js +++ b/bigbluebutton-html5/tests/webdriverio/specs/acceptance/login.spec.js @@ -21,9 +21,9 @@ describe('Landing page', function () { utils.setUsername(new Map([ ['chromeBrowser', 'Alex'], - ['chromeDevBrowser', 'Anton'], + ['chromeBrowser', 'Anton'], ['firefoxBrowser', 'Danny'], - ['firefoxNightlyBrowser', 'Maxim'], + ['firefoxBrowser', 'Maxim'], ['chromeMobileBrowser', 'Oswaldo'] ])); diff --git a/bigbluebutton-html5/tests/webdriverio/tools/.gitkeep b/bigbluebutton-html5/tests/webdriverio/tools/.gitkeep deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/bigbluebutton-html5/tests/webdriverio/wdio.conf.js b/bigbluebutton-html5/tests/webdriverio/wdio.conf.js index 6cedf60d2f0404b0e998a1523e1daf09e135c1c8..1195d8b5e5019638ffcf9081ede499bde516b3c0 100644 --- a/bigbluebutton-html5/tests/webdriverio/wdio.conf.js +++ b/bigbluebutton-html5/tests/webdriverio/wdio.conf.js @@ -19,25 +19,11 @@ exports.config = { browserName: 'chrome' } }, - chromeDevBrowser: { - desiredCapabilities: { - browserName: 'chrome', - chromeOptions: { - binary: '/opt/google/chrome-unstable/google-chrome-unstable' - } - } - }, firefoxBrowser: { desiredCapabilities: { browserName: 'firefox' } }, - firefoxNightlyBrowser: { - desiredCapabilities: { - browserName: 'firefox', - firefox_binary: '/usr/lib/firefox-trunk/firefox-trunk' - } - }, chromeMobileBrowser: { desiredCapabilities: { browserName: 'chrome',