Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ACA-4695] Fix saving screenshots for E2Es, add nx eslint plugin #3148

Merged
merged 2 commits into from
Apr 26, 2023
Merged

[ACA-4695] Fix saving screenshots for E2Es, add nx eslint plugin #3148

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
257bcc3
[ACA-4695] Fix saving screenshots for E2Es, add nx eslint plugin
MichalKinas Apr 25, 2023
442705f
[ACA-4695] Improve eslint rules
MichalKinas Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/ng-cli-compat",
"plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
"plugin:@nrwl/nx/typescript",
"plugin:@nrwl/nx/angular",
"plugin:@angular-eslint/template/process-inline-templates",
"plugin:@cspell/recommended"
],
Expand Down Expand Up @@ -165,6 +165,11 @@
"unicorn/filename-case": "error"
}
},
{
"files": ["*.js"],
"extends": ["plugin:@nrwl/nx/javascript"],
"rules": {}
},
{
"files": [
"*.html"
Expand Down
7 changes: 7 additions & 0 deletions .github/actions/run-e2e/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,10 @@ runs:
echo "./node_modules/.bin/protractor \"./protractor.conf.js\" ${{ inputs.options }} || exit 1"
./node_modules/.bin/protractor "./protractor.conf.js" ${{ inputs.options }} $E2E_PROTRACTOR_OPTS || exit 1
fi

- name: Upload E2Es results
if: ${{ always() }}
uses: actions/upload-artifact@v3
with:
name: ${{ inputs.options }}
path: test-results/
3 changes: 3 additions & 0 deletions .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ env:
APP_CONFIG_ECM_HOST: ${{ secrets.PIPELINE_ENV_URL }}
ADMIN_EMAIL: ${{ secrets.PIPELINE_ADMIN_USERNAME }}
ADMIN_PASSWORD: ${{ secrets.PIPELINE_ADMIN_PASSWORD }}
SCREENSHOT_USERNAME: ${{ secrets.SCREENSHOT_USERNAME }}
SCREENSHOT_PASSWORD: ${{ secrets.SCREENSHOT_PASSWORD}}
AWS_REGION: "eu-west-2"
CONTENT_CE_DIST_PATH: "./dist/content-ce"
APP_CONFIG_PROVIDER: ECM
Expand All @@ -36,6 +38,7 @@ env:
APP_CONFIG_DOWNLOAD_PROMPT_REMINDER_DELAY: 30
APP_CONFIG_ENABLE_FILE_AUTO_DOWNLOAD: true
APP_CONFIG_FILE_AUTO_DOWNLOAD_SIZE_THRESHOLD_IN_MB: 15
GH_BUILD_NUMBER: ${{ github.run_id }}

jobs:
lint:
Expand Down
2 changes: 1 addition & 1 deletion e2e/e2e-config/utils/upload-output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const buildNumber = require('./build-number');
const outputDir = path.resolve(__dirname, '../../../e2e-output/');

async function saveScreenshots(retryCount) {
const folderName = process.env.TRAVIS_JOB_NAME.replace(/[^a-z0-9]/gi, '_').toLowerCase();
const folderName = process.env.GITHUB_JOB;
console.log(`Start uploading report in ${folderName}`);

let alfrescoJsApi = new AlfrescoApi({
Expand Down
79 changes: 79 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
"@angular/language-service": "14.1.2",
"@cspell/eslint-plugin": "^6.31.1",
"@nrwl/angular": "15.9.2",
"@nrwl/eslint-plugin-nx": "^15.9.2",
"@nrwl/workspace": "15.9.2",
"@playwright/test": "^1.31.2",
"@schematics/angular": "14.1.2",
Expand Down