Fix e2e tests

Author: JBWatenbergScality

.github/workflows/single-node-test.yaml

@@ -100,7 +100,7 @@ jobs:
           source product.txt
           echo "METALK8S_VERSION=$VERSION" >> $GITHUB_ENV
 
-     ## Spawn {{{
+      ## Spawn {{{
       - name: Export environment variables for accessing the cloud
         uses: ./.github/actions/export-cloud-env
         with:
@@ -240,6 +240,16 @@ jobs:
         uses: ./.github/actions/bastion-ui-tests
       # }}}
 
+      - name: Collect UI tests videos
+        if: always()
+        continue-on-error: true
+        run: |
+          export DEST_DIR="artifacts/ui-e2e-tests/${{ github.job }}"
+          mkdir -p ${DEST_DIR}
+          scp -F ssh_config \
+            "bastion:/home/centos/metalk8s/ui/cypress/videos/e2e/*" \
+            "${DEST_DIR}/"
+
       - name: Generate and Collect sosreport
         if: always()
         uses: ./.github/actions/sosreport-logs

ui/cypress/integration/e2e/common/login.js

@@ -6,7 +6,6 @@ Given('I am logged in', () => {
   cy.route('GET', '/oidc/.well-known/openid-configuration').as(
     'getOidcConfiguration',
   );
-  cy.wait('@getOidcConfiguration');
 
   //Check if we are redirected to the DEX login page
   cy.location('pathname').should('eq', '/oidc/auth');
@@ -33,18 +32,15 @@ Given('I am logged in', () => {
   };
   cy.wait('@saltAuthentication', timeOut);
 
-  cy.findByRole('navigation').should(
-    'contain',
-    userName,
-  );
+  cy.findByRole('navigation').should('contain', userName);
 });
 
 Then('I log out', () => {
   const userName = Cypress.env('username');
   cy.findByRole('navigation').within(() => {
     cy.findByText(userName).click();
     cy.findByText(/log out/i).click();
-  })
+  });
   //Check if we are redirected to the DEX login page
   cy.location('pathname').should('eq', '/oidc/auth');
 });