ui: Review tests following to solutions navbar integration

Refs: #3104

eve/main.yml

@@ -1189,7 +1189,7 @@ stages:
           name: Install Cypress and its dependencies
           workdir: build/ui
           command: |
-            PKGS="cypress cypress-cucumber-preprocessor cypress-wait-until"
+            PKGS="cypress cypress-cucumber-preprocessor cypress-wait-until @testing-library/cypress"
             for pkg in $PKGS; do
               npm install --no-save --no-package-lock $pkg@$(node -p \
                 -e "require('./package-lock.json').dependencies['$pkg'].version" \

ui/cypress/fixtures/config.json

@@ -4,7 +4,7 @@
     "url_prometheus": "/api/prometheus",
     "url_grafana": "/grafana",
     "url_oidc_provider": "/oidc",
-    "url_redirect": "/oauth2/callback",
+    "url_redirect": "/",
     "url_doc": "/docs",
     "url_alertmanager": "/api/alertmanager"
-}
+}

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

@@ -12,7 +12,7 @@ Given('I am logged in', () => {
   cy.location('pathname').should('eq', '/oidc/auth');
 
   //click "Login with email" button when DEX "alwaysShowLoginScreen" is true
-  cy.get('.theme-form-row button').click();
+  cy.findByText(/Log in with Email/i).click();
 
   const email = Cypress.env('email');
   const userName = Cypress.env('username');
@@ -24,7 +24,7 @@ Given('I am logged in', () => {
   cy.get('button').click();
 
   //Check if the login is successfull and we going back to the UI
-  cy.location('pathname').should('eq', '/oauth2/callback');
+  cy.location('pathname').should('eq', '/');
   cy.server();
   cy.route('POST', '/api/salt/login').as('saltAuthentication');
   const timeOut = {
@@ -33,16 +33,18 @@ Given('I am logged in', () => {
   };
   cy.wait('@saltAuthentication', timeOut);
 
-  cy.get('[data-cy="user_dropdown"] .trigger > .sc-trigger-text').should(
+  cy.findByRole('navigation').should(
     'contain',
     userName,
   );
 });
 
 Then('I log out', () => {
-  cy.get('[data-cy="user_dropdown"] .trigger > .sc-trigger-text').click();
-  cy.get('[data-cy="logout_button"]').click();
-
+  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');
 });

ui/cypress/support/commands.js

@@ -24,6 +24,8 @@
 // -- This is will overwrite an existing command --
 // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
 import 'cypress-wait-until';
+import '@testing-library/cypress/add-commands'
+
 
 import {
   EMPTY_QUERY_RANGE_RESULT,

ui/package.json

@@ -75,6 +75,7 @@
     "@babel/plugin-proposal-optional-chaining": "^7.2.0",
     "@babel/preset-flow": "^7.0.0",
     "@redux-saga/testing-utils": "^1.0.2",
+    "@testing-library/cypress": "^7.0.3",
     "@testing-library/jest-dom": "^5.11.9",
     "@testing-library/react": "^11.2.3",
     "@testing-library/react-hooks": "^3.4.2",