From 8744b525cdb3c54ba9a2dd232501232297431315 Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Fri, 2 Oct 2020 17:45:03 +0200 Subject: [PATCH] Update test deps --- test/package-lock.json | 36 ++++++++++++++++++------------------ test/package.json | 2 +- test/test.js | 19 +++---------------- 3 files changed, 22 insertions(+), 35 deletions(-) diff --git a/test/package-lock.json b/test/package-lock.json index 57ccf4b..51245ed 100644 --- a/test/package-lock.json +++ b/test/package-lock.json @@ -52,9 +52,9 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" }, "@types/node": { - "version": "14.6.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.6.4.tgz", - "integrity": "sha512-Wk7nG1JSaMfMpoMJDKUsWYugliB2Vy55pdjLpmLixeyMi7HizW2I/9QoxsPCkXl3dO+ZOVqPumKaDUv5zJu2uQ==" + "version": "14.11.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz", + "integrity": "sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==" }, "@types/yauzl": { "version": "2.9.1", @@ -74,11 +74,11 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "ms": { @@ -282,9 +282,9 @@ } }, "chromedriver": { - "version": "85.0.0", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-85.0.0.tgz", - "integrity": "sha512-Noinnkl9gRsfC1EYA5trcOVf9r/P6JJnWf+mU6KZS3xLjV9x/o71VZ+gqRl3oSI4PnTGnqYRISZFQk/teYVTRg==", + "version": "85.0.1", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-85.0.1.tgz", + "integrity": "sha512-z8je3U4tXFZnx7AloRabM4Ep1lpFJvHxLoGuRvLg33Qy0UKk/z6OXmHUO2z6DKE0Oe6CFpjj/bdhuQ8dfvq9ug==", "requires": { "@testim/chrome-version": "^1.0.7", "axios": "^0.19.2", @@ -574,11 +574,11 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "ms": { @@ -778,11 +778,11 @@ }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "ms": { diff --git a/test/package.json b/test/package.json index 354dcb6..1d4cb08 100644 --- a/test/package.json +++ b/test/package.json @@ -9,7 +9,7 @@ "author": "", "license": "ISC", "dependencies": { - "chromedriver": "^85.0.0", + "chromedriver": "^85.0.1", "expect.js": "^0.3.1", "mocha": "^8.1.3", "rimraf": "^3.0.2", diff --git a/test/test.js b/test/test.js index 2329635..9627ffc 100755 --- a/test/test.js +++ b/test/test.js @@ -34,9 +34,8 @@ describe('Application life cycle test', function () { var SSH_PORT = 29420; var app; - var token; + var browser; - var server, browser = new Builder().forBrowser('chrome').build(); var repodir = '/tmp/testrepo'; var reponame = 'testrepo'; @@ -45,26 +44,14 @@ describe('Application life cycle test', function () { var email = process.env.EMAIL; before(function () { - var seleniumJar= require('selenium-server-standalone-jar'); - var SeleniumServer = require('selenium-webdriver/remote').SeleniumServer; - server = new SeleniumServer(seleniumJar.path, { port: 4444 }); - server.start(); + browser = new Builder().forBrowser('chrome').setChromeOptions(new Options().windowSize({ width: 1280, height: 1024 })).build(); }); - after(function (done) { + after(function () { browser.quit(); rimraf.sync(repodir); - done(); }); - function waitForUrl(url) { - return browser.wait(function () { - return browser.getCurrentUrl().then(function (currentUrl) { - return currentUrl === url; - }); - }, TIMEOUT); - } - function getAppInfo() { var inspect = JSON.parse(execSync('cloudron inspect'));