inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-24 17:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AAE-4608] Use smartrunner version 2 (#2009)

Browse Source 
* [AAE-4608] Use smartrunner version 2

* Fix wrong path
This commit is contained in:
Popovics András
2021-02-19 22:21:31 +01:00
committed by GitHub
parent 28876a30e6
commit aaefe4c416
4 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
e2e/smartrunner-factory.js Normal file
View File

@@ -0,0 +1,14 @@
const SmartRunnerFactory = require('protractor-smartrunner').SmartRunnerFactory;
const resolve = require('path').resolve;
const outputDirectory = process.env.SMART_RUNNER_DIRECTORY;
const repoHash = process.env.GIT_HASH;
console.log(`SmartRunner's repoHash: "${repoHash}"`);
console.log(`SmartRunner's outputDirectory: "${outputDirectory}"`);
module.exports = new SmartRunnerFactory({
repoHash,
...(outputDirectory ? { outputDirectory: resolve(__dirname, '..', outputDirectory) } : {}),
exclusionPath: resolve(__dirname, 'protractor.excludes.json')
});

6
package-lock.json generated
View File

@@ -12910,9 +12910,9 @@
} }
}, },
"protractor-smartrunner": { "protractor-smartrunner": {
"version": "1.0.0", "version": "2.0.0-beta6",
"resolved": "https://registry.npmjs.org/protractor-smartrunner/-/protractor-smartrunner-1.0.0.tgz", "resolved": "https://registry.npmjs.org/protractor-smartrunner/-/protractor-smartrunner-2.0.0-beta6.tgz",
"integrity": "sha512-jfMsfWlH7SDmamVlVIS+3tkms4W7qJnHOG3rpWO+8iz3jSaB0Ep4KprQJ0qZdnkE1Toksoaf71lY4geFEFZzkA==", "integrity": "sha512-VrHZtga960Yiyv0eea4sTWFz5wBWz55KYo0zTcVSNRSK6ZXF0uA+yElfeqJEwVHF+lEC+IZFpuSgHkD2rhQGxw==",
"dev": true, "dev": true,
"requires": { "requires": {
"filenamify": "4.1.0", "filenamify": "4.1.0",

2
package.json
View File

@@ -100,7 +100,7 @@
"protractor": "^7.0.0", "protractor": "^7.0.0",
"protractor-retry-angular-cli": "^2.0.2", "protractor-retry-angular-cli": "^2.0.2",
"protractor-screenshoter-plugin": "0.10.3", "protractor-screenshoter-plugin": "0.10.3",
"protractor-smartrunner": "^1.0.0", "protractor-smartrunner": "^2.0.0-beta6",
"rxjs-tslint": "^0.1.8", "rxjs-tslint": "^0.1.8",
"rxjs-tslint-rules": "^4.34.3", "rxjs-tslint-rules": "^4.34.3",
"selenium-webdriver": "^4.0.0-alpha.7", "selenium-webdriver": "^4.0.0-alpha.7",

20
protractor.conf.js
View File

@@ -1,17 +1,16 @@
// Protractor configuration file, see link for more information // Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts // https://github.com/angular/protractor/blob/master/lib/config.ts
require('dotenv').config({ path: process.env.ENV_FILE });
const path = require('path'); const path = require('path');
const {SpecReporter} = require('jasmine-spec-reporter'); const { SpecReporter } = require('jasmine-spec-reporter');
const fs = require('fs'); const fs = require('fs');
const resolve = require('path').resolve; const resolve = require('path').resolve;
const logger = require('./tools/helpers/logger'); const logger = require('./tools/helpers/logger');
const retry = require('protractor-retry-angular-cli').retry; const retry = require('protractor-retry-angular-cli').retry;
const {uploadScreenshot} = require('./e2e/e2e-config/utils/upload-output'); const { uploadScreenshot } = require('./e2e/e2e-config/utils/upload-output');
const smartRunnerFactory = require('./e2e/smartrunner-factory');
require('dotenv').config({path: process.env.ENV_FILE});
const SmartRunner = require('protractor-smartrunner');
const projectRoot = path.resolve(__dirname); const projectRoot = path.resolve(__dirname);
const downloadFolder = path.join(__dirname, 'e2e-downloads'); const downloadFolder = path.join(__dirname, 'e2e-downloads');
const screenshotsFolder = path.resolve(__dirname, 'e2e-output'); const screenshotsFolder = path.resolve(__dirname, 'e2e-output');
@@ -141,9 +140,8 @@ exports.config = {
showColors: true, showColors: true,
defaultTimeoutInterval: 200000, defaultTimeoutInterval: 200000,
includeStackTrace: true, includeStackTrace: true,
print: function () { print: function () {},
}, ...(process.env.CI ? smartRunnerFactory.applyExclusionFilter() : {})
...SmartRunner.withOptionalExclusions(resolve(__dirname, './e2e/protractor.excludes.json'))
}, },
plugins: [ plugins: [
@@ -170,11 +168,7 @@ exports.config = {
onPrepare() { onPrepare() {
if (process.env.CI) { if (process.env.CI) {
retry.onPrepare(); retry.onPrepare();
const repoHash = process.env.GIT_HASH || ''; smartRunnerFactory.getInstance().onPrepare();
const outputDirectory = process.env.SMART_RUNNER_DIRECTORY;
logger.info(`SmartRunner's repoHash : "${repoHash}"`);
logger.info(`SmartRunner's outputDirectory: "${outputDirectory}"`);
SmartRunner.apply({outputDirectory, repoHash});
} }
const tsConfigPath = path.resolve(e2eFolder, 'tsconfig.e2e.json'); const tsConfigPath = path.resolve(e2eFolder, 'tsconfig.e2e.json');