From 921d9b0e3c8bbdbaae1399ca03b3607407f8eee2 Mon Sep 17 00:00:00 2001
From: Tomas Hehejik <thehejik@suse.com>
Date: Thu, 6 Oct 2022 16:47:42 +0200
Subject: [PATCH] Comments incorporated

---
 .github/workflows/master_rancher_ui_workflow.yml |  2 +-
 README.md                                        | 11 +++++++----
 cypress/integration/unit_tests/menu.spec.ts      |  6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/master_rancher_ui_workflow.yml b/.github/workflows/master_rancher_ui_workflow.yml
index 6373e0b7..3e8f12ef 100644
--- a/.github/workflows/master_rancher_ui_workflow.yml
+++ b/.github/workflows/master_rancher_ui_workflow.yml
@@ -193,7 +193,7 @@ jobs:
         RANCHER_URL: https://epinio.${{ needs.installation.outputs.MY_IP }}.omg.howdoi.website
         SYSTEM_DOMAIN: ${{ needs.installation.outputs.MY_IP }}.omg.howdoi.website
         # set UI value to something else than 'rancher'
-        UI: epinio
+        UI: epinio-rancher
       options: --add-host ${{ needs.installation.outputs.MY_HOSTNAME}}:${{ needs.installation.outputs.MY_IP }} --ipc=host ${{ inputs.docker_options }}
     steps:
       - name: Cypress run
diff --git a/README.md b/README.md
index 9310166c..b508ab19 100644
--- a/README.md
+++ b/README.md
@@ -59,12 +59,15 @@ make cypress-gui
 ```
 
 ## Scenario 1 - Using Chrome
-In this first scenario, Epinio is deployed with default options. </br>
-You can check all the things we test directly in the [file](./cypress/integration/scenarios/with_default_options.spec.ts).
+In this first scenario, Epinio is deployed in Rancher with default options. </br>
+And then basic UI test is performed [menu.spec.ts](./cypress/integration/unit_tests/menu.spec.ts).
+<!-- You can check all the things we test directly in the [file](./cypress/integration/scenarios/with_default_options.spec.ts). -->
 
 ## Scenario 2 - Using Firefox
-Second scenario tests Epinio installation with S3 and external registry configured. </br>
-Unlike the first scenario, we only play a small bunch of [tests](./cypress/integration/scenarios/with_s3_and_external_registry.spec.ts).
+Second scenario is the same as the first one just performed in Firefox. </br>
+TODO: Get back installation with S3 and external registry configuration within rancher installation. Ref. [Issue#236](https://github.com/epinio/epinio-end-to-end-tests/issues/236)
+<!-- Second scenario tests Epinio installation with S3 and external registry configured. </br>
+Unlike the first scenario, we only play a small bunch of [tests](./cypress/integration/scenarios/with_s3_and_external_registry.spec.ts). -->
 
 ## Process explained in one chart
 ```mermaid
diff --git a/cypress/integration/unit_tests/menu.spec.ts b/cypress/integration/unit_tests/menu.spec.ts
index 33854b0a..27be0665 100644
--- a/cypress/integration/unit_tests/menu.spec.ts
+++ b/cypress/integration/unit_tests/menu.spec.ts
@@ -139,7 +139,7 @@ describe('Login with different users', () => {
       cy.contains('Applications').should('be.visible')
     }
     // Login fails when installed from rancher
-    else if (Cypress.env('ui') == 'epinio' || Cypress.env('ui') == 'rancher') {
+    else if (Cypress.env('ui') == 'epinio-rancher' || Cypress.env('ui') == 'rancher') {
       cy.contains('Invalid username or password. Please try again.').should('exist')
     }
   });
@@ -153,7 +153,7 @@ describe('Login with different users', () => {
       cy.contains('Applications').should('be.visible')
     }
     // Login fails when installed from rancher
-    else if (Cypress.env('ui') == 'epinio' || Cypress.env('ui') == 'rancher') {
+    else if (Cypress.env('ui') == 'epinio-rancher' || Cypress.env('ui') == 'rancher') {
       cy.contains('Invalid username or password. Please try again.').should('exist')
     }
   });
@@ -167,7 +167,7 @@ describe('Login with different users', () => {
       cy.contains('Applications').should('be.visible')
     }
     // Login fails when installed from rancher
-    else if (Cypress.env('ui') == 'epinio' || Cypress.env('ui') == 'rancher') {
+    else if (Cypress.env('ui') == 'epinio-rancher' || Cypress.env('ui') == 'rancher') {
       cy.contains('Invalid username or password. Please try again.').should('exist')
     }
   });