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.

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

feat: angular v14 and migrate from protractor to playwright #432

Merged
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
24a6d53
test(e2e): playwright
ronnymikalsen Oct 7, 2022
d8b72b8
test(e2e): scripts
ronnymikalsen Oct 12, 2022
ac6d8b2
ci: lambdatest
ronnymikalsen Oct 14, 2022
370370c
style:
ronnymikalsen Oct 14, 2022
e733967
test(e2e): a11y
ronnymikalsen Oct 14, 2022
7b03270
fix: a11y
ronnymikalsen Oct 14, 2022
b8c4dc8
fix: @fullscreen and a11y
ronnymikalsen Oct 17, 2022
4422649
fix: plugin
ronnymikalsen Oct 17, 2022
28eef0c
refactor:
ronnymikalsen Oct 17, 2022
26ca9ca
refactor:
ronnymikalsen Oct 17, 2022
11b9d86
refactor:
ronnymikalsen Oct 17, 2022
ee7f6fb
refactor:
ronnymikalsen Oct 19, 2022
c5fe64d
refactor:
ronnymikalsen Oct 19, 2022
9843d7f
refractor:
ronnymikalsen Oct 19, 2022
0d2999c
refactor:
ronnymikalsen Oct 19, 2022
9a9c637
refactor:
ronnymikalsen Oct 20, 2022
d601158
refactor:
ronnymikalsen Oct 20, 2022
033f895
build:
ronnymikalsen Oct 20, 2022
01773ee
build:
ronnymikalsen Oct 20, 2022
436cea2
build:
ronnymikalsen Oct 20, 2022
ac8a8d2
build:
ronnymikalsen Oct 20, 2022
85990b1
build:
ronnymikalsen Oct 20, 2022
1088ea6
build:
ronnymikalsen Oct 20, 2022
8c8d6c2
ci: retry
ronnymikalsen Oct 20, 2022
fd3397a
chore: removed e2e for demo and elements
ronnymikalsen Oct 20, 2022
f42f135
ci: better error handling
ronnymikalsen Oct 20, 2022
54a350b
fix:
ronnymikalsen Oct 20, 2022
5232bd9
fix: retry
ronnymikalsen Oct 21, 2022
7a4b9fe
fix: longer wait on animations
ronnymikalsen Oct 21, 2022
7dd6ce5
refactor:
ronnymikalsen Oct 21, 2022
4680a71
ci:
ronnymikalsen Oct 21, 2022
b242736
refactor:
ronnymikalsen Oct 21, 2022
c69cc04
ci:
ronnymikalsen Oct 21, 2022
22e7f6e
fix:
ronnymikalsen Oct 21, 2022
267d490
refactor:
ronnymikalsen Oct 21, 2022
9c313d7
revert:
ronnymikalsen Oct 24, 2022
f39422a
revert:
ronnymikalsen Oct 24, 2022
5c2e434
revert:
ronnymikalsen Oct 24, 2022
81d8a9e
fix: newer run @ignore
ronnymikalsen Oct 25, 2022
d15ca07
fix: no need to add quotation around <viewingDirection>
ronnymikalsen Oct 25, 2022
85ff81c
refactor: filenames using dash
ronnymikalsen Oct 25, 2022
09253ff
refactor: oneliner
ronnymikalsen Oct 25, 2022
631a41d
fix: wait for element
ronnymikalsen Oct 25, 2022
82b3d32
fix: wait for timeout
ronnymikalsen Oct 25, 2022
4b29cff
refactor: removed redundant variable
ronnymikalsen Oct 25, 2022
ca311aa
refactor: had a locator for this
ronnymikalsen Oct 25, 2022
50aceb7
fix: typed forms
ronnymikalsen Oct 25, 2022
2a7a752
fix: no translation
ronnymikalsen Oct 25, 2022
c3d9fca
fix: lt translation
ronnymikalsen Oct 25, 2022
84294bd
fix: typed forms
ronnymikalsen Oct 25, 2022
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
11 changes: 5 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@ jobs:
- checkout
- browser-tools/install-chrome
- browser-tools/install-chromedriver
- run: echo 127.0.0.1 lh | sudo tee -a /etc/hosts
- run: find ./apps/integration* -type f -exec sed -i 's/localhost/lh/' {} \;
- run: 'mkdir -p $LOGS_DIR'
- run: 'chmod +x ./scripts/ci/build-and-test.sh'
- run: 'chmod +x ./scripts/saucelabs/start-tunnel.sh'
- run: 'chmod +x ./scripts/saucelabs/wait-tunnel.sh'
- run: 'chmod +x ./scripts/saucelabs/stop-tunnel.sh'
- run: 'chmod +x ./apps/integration-e2e/scripts/wait-on.sh'
- run: 'chmod +x ./scripts/lambdatest/start-tunnel.sh'
- run: 'chmod +x ./scripts/lambdatest/wait-tunnel.sh'
- run: 'chmod +x ./scripts/lambdatest/stop-tunnel.sh'
- run: 'chmod +x ./scripts/ci/wait-on.sh'
- run: 'yarn install'
- run:
name: Build and test
command: './scripts/ci/build-and-test.sh'
7 changes: 1 addition & 6 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,7 @@
"no-async-promise-executor": "off",
"no-empty": "off",
"prefer-const": "off",
"prefer-spread": "off",
"protractor/no-repetitive-selectors": "off",
"protractor/no-browser-sleep": "off",
"protractor/no-repetitive-locators": "off",
"protractor/no-shadowing": "off",
"protractor/missing-wait-message": "off"
"prefer-spread": "off"
}
},
{
Expand Down
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"cucumber.glue": ["apps/integration-e2e/src/**/*.ts"],
"cucumber.features": ["apps/integration-e2e/src/features/**/*.feature"]
}
9 changes: 9 additions & 0 deletions angular-http-server.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module.exports = {
proxy: [
{
forward: ["/catalog/"],
target: "localhost:4040",
protocol: "http",
},
],
};
59 changes: 2 additions & 57 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,31 +109,6 @@
},
"tags": []
},
"demo-e2e": {
"root": "apps/demo-e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "apps/demo-e2e/protractor.conf.js",
"devServerTarget": "demo:serve"
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": [
"apps/demo-e2e/src/**/*.ts",
"apps/demo-e2e/src/**/*.html"
]
},
"outputs": ["{options.outputFile}"]
}
},
"tags": [],
"implicitDependencies": ["demo"]
},
"elements": {
"projectType": "application",
"schematics": {
Expand Down Expand Up @@ -244,32 +219,6 @@
},
"tags": []
},
"elements-e2e": {
"root": "apps/elements-e2e",
"sourceRoot": "apps/elements-e2e/src",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "apps/elements-e2e/protractor.conf.js",
"devServerTarget": "elements:serve"
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": [
"apps/elements-e2e/src/**/*.ts",
"apps/elements-e2e/src/**/*.html"
]
},
"outputs": ["{options.outputFile}"]
}
},
"tags": [],
"implicitDependencies": ["elements"]
},
"integration": {
"root": "apps/integration/",
"sourceRoot": "apps/integration/src",
Expand Down Expand Up @@ -387,6 +336,7 @@
"tags": []
},
"integration-e2e": {
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"root": "apps/integration-e2e/",
"projectType": "application",
"architect": {
Expand All @@ -400,12 +350,7 @@
"lint": {
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": [
"apps/integration-e2e/helpers/**/*.ts",
"apps/integration-e2e/pages/**/*.ts",
"apps/integration-e2e/step-definitions/**/*.ts",
"apps/integration-e2e/*.js"
]
"lintFilePatterns": ["apps/integration-e2e/**/*.ts"]
},
"outputs": ["{options.outputFile}"]
}
Expand Down
17 changes: 0 additions & 17 deletions apps/demo-e2e/.eslintrc.json

This file was deleted.

28 changes: 0 additions & 28 deletions apps/demo-e2e/protractor.conf.js

This file was deleted.

14 changes: 0 additions & 14 deletions apps/demo-e2e/src/app.e2e-spec.ts

This file was deleted.

13 changes: 0 additions & 13 deletions apps/demo-e2e/src/app.po.ts

This file was deleted.

19 changes: 0 additions & 19 deletions apps/demo-e2e/tsconfig.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}
],
"license": "https://www.nb.no/lisens/ccbyncnd",
"attribution": "<span>Du kan dele, kopiere, distribuere og spre dette verket så lenge du krediterer opphavspersonen korrekt og ikke bruker verket kommersielt. Dersom du remixer, bearbeider eller bygger på verket, kan du ikke distribuere det endrede materialet.<br/><br/><img src=\"https://static.nb.no/images/license/ccbyncnd_88x31.png\"/></span>",
"attribution": "<span>Du kan dele, kopiere, distribuere og spre dette verket så lenge du krediterer opphavspersonen korrekt og ikke bruker verket kommersielt. Dersom du remixer, bearbeider eller bygger på verket, kan du ikke distribuere det endrede materialet.<br/><br/><img src=\"https://static.nb.no/images/license/ccbyncnd_88x31.png\" alt=\"Image showing logo to license ccbyncnd\"/></span>",
"service": {
"@context": "http://iiif.io/api/search/0/context.json",
"@id": "https://api.nb.no:443/catalog/v1/contentsearch/10ca37a8595f4a63dd033dbfa4a130bc/search",
Expand Down
3 changes: 2 additions & 1 deletion apps/demo/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"forceConsistentCasingInFileNames": true,
"strict": true,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true
"noFallthroughCasesInSwitch": true,
"target": "es2020"
},
"angularCompilerOptions": {
"strictInjectionParameters": true,
Expand Down
17 changes: 0 additions & 17 deletions apps/elements-e2e/.eslintrc.json

This file was deleted.

28 changes: 0 additions & 28 deletions apps/elements-e2e/protractor.conf.js

This file was deleted.

17 changes: 0 additions & 17 deletions apps/elements-e2e/src/elements.e2e-spec.ts

This file was deleted.

12 changes: 0 additions & 12 deletions apps/elements-e2e/src/elements.po.ts

This file was deleted.

20 changes: 0 additions & 20 deletions apps/elements-e2e/tsconfig.json

This file was deleted.

3 changes: 2 additions & 1 deletion apps/elements/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"forceConsistentCasingInFileNames": true,
"strict": true,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true
"noFallthroughCasesInSwitch": true,
"target": "es2020"
},
"angularCompilerOptions": {
"strictInjectionParameters": true,
Expand Down
2 changes: 1 addition & 1 deletion apps/integration-e2e/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["plugin:protractor/recommended", "../../.eslintrc.json"],
"extends": ["plugin:playwright/playwright-test", "../../.eslintrc.json"],
"ignorePatterns": ["!**/*"],
"overrides": [
{
Expand Down
Loading