From f1097800db1ab428560a566f6fbae178117e76c1 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Fri, 17 Jul 2020 11:18:00 +0100 Subject: [PATCH] Remove protractor noise plugin (#1526) * remove protractor noise plugin * missing plugin * pin version * new lock --- e2e/e2e-config/utils/upload-output.js | 2 +- package-lock.json | 94 +++------------------------ package.json | 6 +- protractor.conf.js | 33 ++++------ 4 files changed, 23 insertions(+), 112 deletions(-) diff --git a/e2e/e2e-config/utils/upload-output.js b/e2e/e2e-config/utils/upload-output.js index 5c3eed1a8..27e02736a 100644 --- a/e2e/e2e-config/utils/upload-output.js +++ b/e2e/e2e-config/utils/upload-output.js @@ -2,7 +2,7 @@ const path = require('path'); const fs = require('fs'); const AlfrescoApi = require('@alfresco/js-api').AlfrescoApiCompatibility; const buildNumber = require('./build-number'); -const configScreenshotsPath = path.join(`${path.resolve(__dirname)}/../../../e2e-output/report/screenshots/`); +const configScreenshotsPath = path.join(`${path.resolve(__dirname)}/../../../e2e-output/screenshots/`); const rimraf = require('rimraf'); uploadOutput = async function() { diff --git a/package-lock.json b/package-lock.json index efa1978ba..ca7a3c44e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4683,30 +4683,6 @@ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", "dev": true }, - "chrome-remote-interface": { - "version": "0.28.2", - "resolved": "https://registry.npmjs.org/chrome-remote-interface/-/chrome-remote-interface-0.28.2.tgz", - "integrity": "sha512-F7mjof7rWvRNsJqhVXuiFU/HWySCxTA9tzpLxUJxVfdLkljwFJ1aMp08AnwXRmmP7r12/doTDOMwaNhFCJsacw==", - "dev": true, - "requires": { - "commander": "2.11.x", - "ws": "^7.2.0" - }, - "dependencies": { - "commander": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", - "dev": true - }, - "ws": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", - "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==", - "dev": true - } - } - }, "chrome-trace-event": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz", @@ -4746,12 +4722,6 @@ "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==", "dev": true }, - "circular-json": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz", - "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==", - "dev": true - }, "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", @@ -9941,6 +9911,16 @@ "colors": "1.4.0" } }, + "jasmine2-protractor-utils": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/jasmine2-protractor-utils/-/jasmine2-protractor-utils-1.1.3.tgz", + "integrity": "sha1-QdJ6+qSiWjNV0IIeMRPnZFX8Q7U=", + "dev": true, + "requires": { + "mkdirp": "^0.5.1", + "q": "^1.4.1" + } + }, "jasminewd2": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/jasminewd2/-/jasminewd2-2.2.0.tgz", @@ -10797,15 +10777,6 @@ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, - "klaw-sync": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz", - "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.11" - } - }, "kleur": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", @@ -14563,45 +14534,6 @@ } } }, - "protractor-screenshoter-plugin": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/protractor-screenshoter-plugin/-/protractor-screenshoter-plugin-0.10.3.tgz", - "integrity": "sha512-OF9kGe1rMxBQY4uXzXQUFT14EB83rz8DlDcxmH5HcOHPBpUhGh+Nwo7+K87w1LoLcTuGdG7Bz+/hGwoGguDfsA==", - "dev": true, - "requires": { - "circular-json": "^0.5.1", - "fs-extra": "^7.0.0", - "klaw-sync": "^6.0.0", - "lodash": "^4.17.11", - "mkdirp": "^0.5.1", - "moment": "^2.20.1", - "q": "^1.5.1", - "screenshoter-report-analyzer": "^0.6", - "uuid": "^3.1.0" - }, - "dependencies": { - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - } - } - }, "proxy-addr": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", @@ -15909,12 +15841,6 @@ "ajv-keywords": "^3.4.1" } }, - "screenshoter-report-analyzer": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/screenshoter-report-analyzer/-/screenshoter-report-analyzer-0.6.0.tgz", - "integrity": "sha1-Cm+I1fXRrBa2z3Ji7/ujH+5I7RI=", - "dev": true - }, "select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", diff --git a/package.json b/package.json index d0378ae4a..1712b35df 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,6 @@ "@types/superagent": "^4.1.8", "adf-tslint-rules": "0.0.7", "ajv-cli": "^3.1.0", - "chrome-remote-interface": "^0.28.2", "codelyzer": "^6.0.0", "commander": "^5.0.0", "cpr": "^3.0.1", @@ -90,6 +89,7 @@ "husky": "^4.2.5", "jasmine-core": "~3.5.0", "jasmine-spec-reporter": "~5.0.2", + "jasmine2-protractor-utils": "1.1.3", "karma": "^5.1.0", "karma-chrome-launcher": "^3.1.0", "karma-coverage-istanbul-reporter": "^3.0.3", @@ -100,7 +100,6 @@ "node-stream-zip": "^1.9.1", "prettier": "^2.0.5", "protractor": "^7.0.0", - "protractor-screenshoter-plugin": "0.10.3", "rxjs-tslint": "^0.1.8", "rxjs-tslint-rules": "^4.34.0", "selenium-webdriver": "^4.0.0-alpha.7", @@ -123,8 +122,5 @@ "hooks": { "pre-commit": "lint-staged" } - }, - "config": { - "chromeDriver": "83.0.4103.116" } } diff --git a/protractor.conf.js b/protractor.conf.js index 4ab725d53..8d65a8883 100755 --- a/protractor.conf.js +++ b/protractor.conf.js @@ -4,7 +4,6 @@ const AlfrescoApi = require('@alfresco/js-api').AlfrescoApiCompatibility; const path = require('path'); const { SpecReporter } = require('jasmine-spec-reporter'); -const CDP = require('chrome-remote-interface'); const afterLaunch = require('./e2e/e2e-config/hooks/after-launch'); const fs = require('fs'); require('dotenv').config(); @@ -110,7 +109,6 @@ exports.config = { capabilities: { browserName: 'chrome', chromeOptions: { - // binary: require('puppeteer').executablePath(), prefs: { credentials_enable_service: false, download: { @@ -144,16 +142,12 @@ exports.config = { plugins: [ { - package: 'protractor-screenshoter-plugin', - screenshotPath: `${projectRoot}/e2e-output/report`, - screenshotOnExpect: 'failure', - screenshotOnSpec: 'none', - withLogs: true, - writeReportFreq: 'end', - imageToAscii: 'none', - htmlOnExpect: 'none', - htmlOnSpec: 'none', - clearFoldersBeforeTest: true + package: 'jasmine2-protractor-utils', + disableScreenshot: false, + screenshotOnExpectFailure: true, + screenshotOnSpecFailure: false, + clearFoldersBeforeTest: true, + screenshotPath: path.resolve(__dirname, 'e2e-output/screenshots/') } ], @@ -190,16 +184,11 @@ exports.config = { rmDir(downloadFolder); - CDP() - .then(client => { - client.send('Page.setDownloadBehavior', { - behavior: 'allow', - downloadPath: downloadFolder - }); - }) - .catch(err => { - console.log(err); - }); + browser.driver.sendChromiumCommand('Page.setDownloadBehavior', { + behavior: 'allow', + downloadPath: downloadFolder + }); + }, afterLaunch };