feat: webkit in cypress pipelines

frontend/app/.gitlab-ci.yml

@@ -4,6 +4,8 @@ e2e:
   script:
     - pnpm --filter=@openstapps/app install
     - pnpm --filter=@openstapps/app exec cypress install
+    - npx playwright install-deps webkit
+    - npx playwright install
     - cd node_modules/.pnpm/re2*/node_modules/re2
     - npm run install
     - cd $CI_PROJECT_DIR
@@ -21,5 +23,6 @@ e2e:
     matrix:
       - BROWSER: chrome
       - BROWSER: firefox
+      - BROWSER: webkit
   rules:
     - !reference [.limit_pipelines, rules]

frontend/app/cypress.config.ts

@@ -28,6 +28,7 @@ export default defineConfig({
     fixturesFolder: 'cypress/fixtures',
     defaultCommandTimeout: 20_000,
     specPattern: 'cypress/integration/**/*.spec.ts',
+    experimentalWebKitSupport: true,
     /*setupNodeEvents(on, config) {
       on('task', {
         log(message) {

frontend/app/cypress/integration/dashboard.spec.ts

@@ -176,7 +176,7 @@ describe('dashboard', async function () {
       cy.visit('/overview');
 
       cy.get('ion-searchbar').click({scrollBehavior: 'center'});
-      cy.url().should('eq', Cypress.config().baseUrl + '/search');
+      cy.url().should('eq', `${Cypress.config().baseUrl?.replace(/\/$/, '')}/search`);
       cy.get('ion-searchbar').should('not.have.value');
       cy.get('ion-searchbar input.searchbar-input').should('have.focus');
 

frontend/app/package.json

@@ -130,7 +130,7 @@
     "@capacitor/cli": "4.6.1",
     "@capacitor/ios": "4.6.1",
     "@compodoc/compodoc": "1.1.19",
-    "@cypress/schematic": "1.7.0",
+    "@cypress/schematic": "2.5.1",
     "@ionic/angular-toolkit": "10.0.0",
     "@ionic/cli": "7.1.1",
     "@openstapps/prettier-config": "workspace:*",
@@ -170,6 +170,7 @@
     "karma-junit-reporter": "2.0.1",
     "karma-mocha-reporter": "2.2.5",
     "license-checker": "25.0.1",
+    "playwright-webkit": "1.38.0",
     "stylelint": "15.10.1",
     "stylelint-config-clean-order": "5.0.1",
     "stylelint-config-prettier-scss": "1.0.0",

images/app-cypress/Dockerfile

@@ -94,6 +94,9 @@ RUN echo  " node version:    $(node -v) \n" \
   "git version:     $(git --version) \n" \
   "whoami:          $(whoami) \n"
 
+# https://docs.cypress.io/guides/guides/launching-browsers#Linux-Dependencies
+RUN npx playwright install-deps webkit
+
 # a few environment variables to make NPM installs easier
 # good colors for most applications
 ENV TERM=xterm

package.json

@@ -40,5 +40,10 @@
     "turbo-ignore": "1.10.6",
     "typedoc": "0.24.8",
     "typescript": "5.1.6"
+  },
+  "pnpm": {
+    "patchedDependencies": {
+      "@cypress/schematic@2.5.1": "patches/@cypress__schematic@2.5.1.patch"
+    }
   }
 }

patches/@cypress__schematic@2.5.1.patch

@@ -0,0 +1,14 @@
+diff --git a/src/builders/cypress/schema.json b/src/builders/cypress/schema.json
+index 70af07ab029ef30f71388db9f91ad411cfb57ace..5a6a0a33ea089524a9b24f121b831c96a065263e 100644
+--- a/src/builders/cypress/schema.json
++++ b/src/builders/cypress/schema.json
+@@ -27,7 +27,8 @@
+         "chromium",
+         "canary",
+         "firefox",
+-        "edge"
++        "edge",
++        "webkit"
+       ]
+     },
+     "devServerTarget": {

pnpm-lock.yaml

@@ -4,6 +4,11 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
+patchedDependencies:
+  '@cypress/schematic@2.5.1':
+    hash: qd7kay72vjjbh3q6b6qch7h5ha
+    path: patches/@cypress__schematic@2.5.1.patch
+
 importers:
 
   .:
@@ -949,8 +954,8 @@ importers:
         specifier: 1.1.19
         version: 1.1.19
       '@cypress/schematic':
-        specifier: 1.7.0
-        version: 1.7.0(@angular/cli@16.1.4)(@angular/core@16.1.4)
+        specifier: 2.5.1
+        version: 2.5.1(patch_hash=qd7kay72vjjbh3q6b6qch7h5ha)(@angular/cli@16.1.4)(@angular/core@16.1.4)
       '@ionic/angular-toolkit':
         specifier: 10.0.0
         version: 10.0.0
@@ -1068,6 +1073,9 @@ importers:
       license-checker:
         specifier: 25.0.1
         version: 25.0.1
+      playwright-webkit:
+        specifier: 1.38.0
+        version: 1.38.0
       prettier:
         specifier: 2.8.6
         version: 2.8.6
@@ -2106,14 +2114,6 @@ packages:
       '@jridgewell/trace-mapping': 0.3.18
     dev: true
 
-  /@angular-devkit/architect@0.1202.18:
-    resolution: {integrity: sha512-C4ASKe+xBjl91MJyHDLt3z7ICPF9FU6B0CeJ1phwrlSHK9lmFG99WGxEj/Tc82+vHyPhajqS5XJ38KyVAPBGzA==}
-    engines: {node: ^12.14.1 || >=14.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
-    dependencies:
-      '@angular-devkit/core': 12.2.18
-      rxjs: 6.6.7
-    dev: true
-
   /@angular-devkit/architect@0.1601.4(chokidar@3.5.3):
     resolution: {integrity: sha512-OOSbNlDy+Q3jY0oFHaq8kkna9HYI1zaS8IHeCIDP6T/ZIAVad4+HqXAL4SKQrKJikkoBQv1Z/eaDBL5XPFK9Bw==}
     engines: {node: ^16.14.0 || >=18.10.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
@@ -2260,18 +2260,6 @@ packages:
       - chokidar
     dev: true
 
-  /@angular-devkit/core@12.2.18:
-    resolution: {integrity: sha512-GDLHGe9HEY5SRS+NrKr14C8aHsRCiBFkBFSSbeohgLgcgSXzZHFoU84nDWrl3KZNP8oqcUSv5lHu6dLcf2fnww==}
-    engines: {node: ^12.14.1 || >=14.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
-    dependencies:
-      ajv: 8.6.2
-      ajv-formats: 2.1.0(ajv@8.6.2)
-      fast-json-stable-stringify: 2.1.0
-      magic-string: 0.25.7
-      rxjs: 6.6.7
-      source-map: 0.7.3
-    dev: true
-
   /@angular-devkit/core@13.3.11(chokidar@3.5.3):
     resolution: {integrity: sha512-rfqoLMRYhlz0wzKlHx7FfyIyQq8dKTsmbCoIVU1cEIH0gyTMVY7PbVzwRRcO6xp5waY+0hA+0Brriujpuhkm4w==}
     engines: {node: ^12.20.0 || ^14.15.0 || >=16.10.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
@@ -2307,15 +2295,6 @@ packages:
       source-map: 0.7.4
     dev: true
 
-  /@angular-devkit/schematics@12.2.18:
-    resolution: {integrity: sha512-bZ9NS5PgoVfetRC6WeQBHCY5FqPZ9y2TKHUo12sOB2YSL3tgWgh1oXyP8PtX34gasqsLjNULxEQsAQYEsiX/qQ==}
-    engines: {node: ^12.14.1 || >=14.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
-    dependencies:
-      '@angular-devkit/core': 12.2.18
-      ora: 5.4.1
-      rxjs: 6.6.7
-    dev: true
-
   /@angular-devkit/schematics@13.3.11(chokidar@3.5.3):
     resolution: {integrity: sha512-ben+EGXpCrClnIVAAnEQmhQdKmnnqFhMp5BqMxgOslSYBAmCutLA6rBu5vsc8kZcGian1wt+lueF7G1Uk5cGBg==}
     engines: {node: ^12.20.0 || ^14.15.0 || >=16.10.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
@@ -5382,21 +5361,18 @@ packages:
       uuid: 8.3.2
     dev: true
 
-  /@cypress/schematic@1.7.0(@angular/cli@16.1.4)(@angular/core@16.1.4):
-    resolution: {integrity: sha512-CouQrVlZ+uHVVBQtmNoMYU9LyoSAmQTOLDpVjrdTdMPpJH1mWnHCL5OCMt+FZLR+43KRiWEvDUjNqSza11oGsQ==}
+  /@cypress/schematic@2.5.1(patch_hash=qd7kay72vjjbh3q6b6qch7h5ha)(@angular/cli@16.1.4)(@angular/core@16.1.4):
+    resolution: {integrity: sha512-tO2lUnr5C0udB4xpewndlTMkEHHdgyvSNLI9+bTdYbxCby8MlxrFpewxmqPIfH21ZmOQP8XghD5uMd3l732ESA==}
     peerDependencies:
-      '@angular/cli': '>=12'
-      '@angular/core': '>=12'
+      '@angular/cli': '>=14'
+      '@angular/core': '>=14'
     dependencies:
-      '@angular-devkit/architect': 0.1202.18
-      '@angular-devkit/core': 12.2.18
-      '@angular-devkit/schematics': 12.2.18
       '@angular/cli': 16.1.4
       '@angular/core': 16.1.4(rxjs@7.8.1)(zone.js@0.13.1)
-      '@schematics/angular': 12.2.18
       jsonc-parser: 3.2.0
       rxjs: 6.6.7
     dev: true
+    patched: true
 
   /@cypress/xvfb@1.2.4(supports-color@8.1.1):
     resolution: {integrity: sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==}
@@ -6466,15 +6442,6 @@ packages:
     resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==}
     dev: true
 
-  /@schematics/angular@12.2.18:
-    resolution: {integrity: sha512-niRS9Ly9y8uI0YmTSbo8KpdqCCiZ/ATMZWeS2id5M8JZvfXbngwiqJvojdSol0SWU+n1W4iA+lJBdt4gSKlD5w==}
-    engines: {node: ^12.14.1 || >=14.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
-    dependencies:
-      '@angular-devkit/core': 12.2.18
-      '@angular-devkit/schematics': 12.2.18
-      jsonc-parser: 3.0.0
-    dev: true
-
   /@schematics/angular@16.1.4:
     resolution: {integrity: sha512-XfoeL+aBVIR/DzgVKGVhHW/TGQnqWvngyJVuCwXEVWzNfjxHYFkchXa78OItpAvTEr6/Y0Me9FQVAGVA4mMUyg==}
     engines: {node: ^16.14.0 || >=18.10.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
@@ -7697,17 +7664,6 @@ packages:
       clean-stack: 2.2.0
       indent-string: 4.0.0
 
-  /ajv-formats@2.1.0(ajv@8.6.2):
-    resolution: {integrity: sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==}
-    peerDependencies:
-      ajv: ^8.0.0
-    peerDependenciesMeta:
-      ajv:
-        optional: true
-    dependencies:
-      ajv: 8.6.2
-    dev: true
-
   /ajv-formats@2.1.1(ajv@8.12.0):
     resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
     peerDependencies:
@@ -7763,15 +7719,6 @@ packages:
       require-from-string: 2.0.2
       uri-js: 4.4.1
 
-  /ajv@8.6.2:
-    resolution: {integrity: sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==}
-    dependencies:
-      fast-deep-equal: 3.1.3
-      json-schema-traverse: 1.0.0
-      require-from-string: 2.0.2
-      uri-js: 4.4.1
-    dev: true
-
   /ajv@8.9.0:
     resolution: {integrity: sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==}
     dependencies:
@@ -15208,6 +15155,21 @@ packages:
     resolution: {integrity: sha512-sxMwpDw/ySY1WB2CE3+IdMuEcWibJ72DDOsXLkSmEaSzwEUaYBT6DWgOfBiHGCux4q433X6+OEFWjlVqp7gL6g==}
     dev: false
 
+  /playwright-core@1.38.0:
+    resolution: {integrity: sha512-f8z1y8J9zvmHoEhKgspmCvOExF2XdcxMW8jNRuX4vkQFrzV4MlZ55iwb5QeyiFQgOFCUolXiRHgpjSEnqvO48g==}
+    engines: {node: '>=16'}
+    hasBin: true
+    dev: true
+
+  /playwright-webkit@1.38.0:
+    resolution: {integrity: sha512-i+/8WMxFgZIRukwFjrU/dDCjHPUE1eFvFSR4I+kIc+WOm0VU5kWhj8b2Ob2Z8Y0BIQKCH8qj6SHW/kXKpc61ug==}
+    engines: {node: '>=16'}
+    hasBin: true
+    requiresBuild: true
+    dependencies:
+      playwright-core: 1.38.0
+    dev: true
+
   /plist@3.1.0:
     resolution: {integrity: sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==}
     engines: {node: '>=10.4.0'}