Fixing cypress system tests

Author: Hackwar

.drone.yml

@@ -21,7 +21,7 @@ steps:
       - echo $(date)
 
   - name: npm
-    image: node:16-bullseye-slim
+    image: node:20-bullseye-slim
     depends_on: [ phpcs ]
     volumes:
       - name: npm-cache
@@ -33,7 +33,7 @@ steps:
 
   - name: prepare_system_tests
     depends_on: [ npm ]
-    image: joomlaprojects/docker-images:systemtests
+    image: joomlaprojects/docker-images:cypress8.2
     volumes:
       - name: cypress-cache
         path: /root/.cache/Cypress
@@ -57,7 +57,7 @@ steps:
 
   - name: phpmin-system-mysql
     depends_on: [ prepare_system_tests ]
-    image: joomlaprojects/docker-images:cypress
+    image: joomlaprojects/docker-images:cypress8.2
     volumes:
       - name: cypress-cache
         path: /root/.cache/Cypress
@@ -69,7 +69,7 @@ steps:
       - unzip joomla.zip
       - apache2ctl -D FOREGROUND &
       - chmod +rwx /root
-      - php installation/joomla.php install --verbose --site-name="Joomla CMS test" [email protected] --admin-username=ci-admin --admin-user="jane doe" --admin-password=joomla-17082005 --db-type=mysqli --db-host=mysql --db-name=test_joomla --db-pass=joomla_ut --db-user=root --db-encryption=0 --db-prefix=mysql_
+      - php installation/joomla.php install --verbose --site-name="Joomla CMS test" [email protected] --admin-username=ci-admin --admin-user="jane doe" --admin-password=joomla-17082005 --db-type=mysqli --db-host=mysql --db-name=test_joomla --db-pass=joomla_ut --db-user=joomla_ut --db-encryption=0 --db-prefix=mysql_
       - php cli/joomla.php config:set debug=true error_reporting=maximum
       - php cli/joomla.php extension:install --path=/tests/www/mysql/pkg-weblinks-current.zip
       - chmod -R 777 /tests/www/mysql/
@@ -82,19 +82,31 @@ steps:
     depends_on:
       - phpmin-system-mysql
     environment:
-      FTP_USERNAME:
-        from_secret: ftpusername
-      FTP_PASSWORD:
-        from_secret: ftppassword
+      WEB_SERVER:
+        from_secret: webserver
+      FTP_KEY:
+        from_secret: ftp_key
+      FTP_USER:
+        from_secret: ftp_user
+      FTP_HOST:
+        from_secret: ftp_host
+      ARTIFACTS_ROOT:
+        from_secret: artifacts_root
       GITHUB_TOKEN:
         from_secret: github_token
     commands:
-      - export PLUGIN_DEST_DIR=/artifacts/$DRONE_REPO/$DRONE_BRANCH/$DRONE_PULL_REQUEST/system-tests/$DRONE_BUILD_NUMBER
-      - echo https://ci.joomla.org$PLUGIN_DEST_DIR
-      - rclone config create artifacts ftp host ci.joomla.org user $FTP_USERNAME port 21 pass $FTP_PASSWORD
-      - rclone mkdir artifacts:$PLUGIN_DEST_DIR
-      - rclone copy tests/cypress/output/ artifacts:$PLUGIN_DEST_DIR
-      - 'curl -X POST "https://api.github.com/repos/$DRONE_REPO/statuses/$DRONE_COMMIT" -H "Content-Type: application/json" -H "Authorization: token $GITHUB_TOKEN" -d "{\"state\":\"failure\", \"context\": \"Artifacts from Failure\", \"description\": \"You can find artifacts from the failure of the build here:\", \"target_url\": \"https://ci.joomla.org$PLUGIN_DEST_DIR\"}" > /dev/null'
+      - export PLUGIN_DEST_DIR=$DRONE_REPO/$DRONE_BRANCH/$DRONE_PULL_REQUEST/system-tests/$DRONE_BUILD_NUMBER
+      - echo https://$WEB_SERVER/drone/$PLUGIN_DEST_DIR
+      - mkdir -p ~/.ssh
+      - eval $(ssh-agent -s)
+      - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
+      - echo "$FTP_KEY" > ~/.ssh/id_rsa
+      - chmod 600 ~/.ssh/id_rsa
+      - ssh-add
+      - rclone config create artifacts sftp host $FTP_HOST user $FTP_USER port 22
+      - rclone mkdir artifacts:$ARTIFACTS_ROOT/$DRONE_REPO/$DRONE_BRANCH/$DRONE_PULL_REQUEST/system-tests/$DRONE_BUILD_NUMBER
+      - rclone copy tests/cypress/output/ artifacts:$ARTIFACTS_ROOT/$DRONE_REPO/$DRONE_BRANCH/$DRONE_PULL_REQUEST/system-tests/$DRONE_BUILD_NUMBER
+      - 'curl -X POST "https://api.github.com/repos/$DRONE_REPO/statuses/$DRONE_COMMIT" -H "Content-Type: application/json" -H "Authorization: token $GITHUB_TOKEN" -d "{\"state\":\"failure\", \"context\": \"Artifacts from Failure\", \"description\": \"You can find artifacts from the failure of the build here:\", \"target_url\": \"https://$WEB_SERVER/drone/$PLUGIN_DEST_DIR\"}" > /dev/null'
     when:
       status:
         - failure
@@ -115,15 +127,7 @@ volumes:
 
 services:
   - name: mysql
-    image: mysql:5.7
-    environment:
-      MYSQL_USER: joomla_ut
-      MYSQL_PASSWORD: joomla_ut
-      MYSQL_ROOT_PASSWORD: joomla_ut
-      MYSQL_DATABASE: test_joomla
-
-  - name: mysql8
-    image: mysql:8
+    image: mysql:8.0
     command: ["--default-authentication-plugin=mysql_native_password"]
     environment:
       MYSQL_USER: joomla_ut
@@ -142,6 +146,6 @@ services:
 
 ---
 kind: signature
-hmac: 1a3e42b169ad2df6a065972457beea9ecbae1dbf0f9a94cb21c27fa416f773ed
+hmac: 1190d2e4eaeb72929792b0cf79a9f08f534ddd34b0febf4244c82b51197e5e69
 
 ...

tests/cypress/integration/install/install.cy.js

@@ -3,7 +3,8 @@
 
 describe('Install Joomla and Weblinks package', () => {
   it('Install Joomla and Weblinks package', function () {
-    cy.doAdministratorLogin(Cypress.env('username'), Cypress.env('password'))
+    cy.doAdministratorLogin(Cypress.env('username'), Cypress.env('password'), false)
+    cy.cancelTour();
     cy.disableStatistics()
     cy.setErrorReportingToDevelopment()
     cy.doAdministratorLogout()